From d6da0396d02693e35073cfd4ec990a85393a92e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 30 Nov 2015 23:00:51 +0100
Subject: [PATCH] Adjust patches
---
apps/files/controller/apicontroller.php | 2 +-
apps/files/service/tagservice.php | 2 +-
apps/files_external/lib/config.php | 8 ++++----
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/apps/files/controller/apicontroller.php b/apps/files/controller/apicontroller.php
index ed14b887479..ee54db63191 100644
--- a/apps/files/controller/apicontroller.php
+++ b/apps/files/controller/apicontroller.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) {
diff --git a/apps/files/service/tagservice.php b/apps/files/service/tagservice.php
index 1999d97e1af..cf3f2bb7865 100644
--- a/apps/files/service/tagservice.php
+++ b/apps/files/service/tagservice.php
@@ -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
*/
diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index cd2498eca40..b0b9db123cd 100644
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -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));
}
}
--
GitLab