From fcfb4205bce86bedefb837431e7abe5194c28cab Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 11 Jan 2017 10:57:26 +0100 Subject: Fix tests Signed-off-by: Joas Schilling --- lib/private/legacy/app.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'lib/private/legacy/app.php') diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php index a989ba94001..a475b895d9f 100644 --- a/lib/private/legacy/app.php +++ b/lib/private/legacy/app.php @@ -1304,10 +1304,10 @@ class OC_App { $data['summary'] = self::findBestL10NOption($data['summary'], $lang); } if ($lang && isset($data['description']) && is_array($data['description'])) { - $data['description'] = self::findBestL10NOption($data['description'], $lang); - } - - if (!isset($data['description'])) { + $data['description'] = trim(self::findBestL10NOption($data['description'], $lang)); + } else if (isset($data['description']) && is_string($data['description'])) { + $data['description'] = trim($data['description']); + } else { $data['description'] = ''; } @@ -1315,10 +1315,10 @@ class OC_App { } /** - * @param $config - * @param $l - * @param $info - * @throws Exception + * @param \OCP\IConfig $config + * @param \OCP\IL10N $l + * @param array $info + * @throws \Exception */ protected static function checkAppDependencies($config, $l, $info) { $dependencyAnalyzer = new DependencyAnalyzer(new Platform($config), $l); -- cgit v1.2.3