Adjust patches

remotes/origin/fix-delete-homeidr-on-userdelete
Thomas Müller 11 years ago
parent dcbd603514
commit d6da0396d0
  1. 2
      apps/files/controller/apicontroller.php
  2. 2
      apps/files/service/tagservice.php
  3. 8
      apps/files_external/lib/config.php

@ -127,7 +127,7 @@ class ApiController extends Controller {
*
* @NoAdminRequired
*
* @param string[] $tagName tag name to filter by
* @param string $tagName tag name to filter by
* @return DataResponse
*/
public function getFilesByTag($tagName) {

@ -91,7 +91,7 @@ class TagService {
/**
* Get all files for the given tag
*
* @param array $tagName tag name to filter by
* @param string $tagName tag name to filter by
* @return FileInfo[] list of matching files
* @throws \Exception if the tag does not exist
*/

@ -358,16 +358,16 @@ class OC_Mount_Config {
* @param \OCP\IL10N $l
* @param string $module
* @param string $backend
* @return OC_L10N_String
* @return string
*/
private static function getSingleDependencyMessage(\OCP\IL10N $l, $module, $backend) {
switch (strtolower($module)) {
case 'curl':
return $l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
return (string)$l->t('<b>Note:</b> The cURL support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
case 'ftp':
return $l->t('<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
return (string)$l->t('<b>Note:</b> The FTP support in PHP is not enabled or installed. Mounting of %s is not possible. Please ask your system administrator to install it.', $backend);
default:
return $l->t('<b>Note:</b> "%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', array($module, $backend));
return (string)$l->t('<b>Note:</b> "%s" is not installed. Mounting of %s is not possible. Please ask your system administrator to install it.', array($module, $backend));
}
}

Loading…
Cancel
Save