diff options
| author | Joas Schilling <coding@schilljs.com> | 2017-01-11 10:57:26 +0100 |
|---|---|---|
| committer | Lukas Reschke <lukas@statuscode.ch> | 2017-01-13 18:33:43 +0100 |
| commit | fcfb4205bce86bedefb837431e7abe5194c28cab (patch) | |
| tree | 0777e8adadc260bef287c12dddc46908b3b8a806 /lib/private/legacy | |
| parent | 1a7d713883ca11716c14e20d5df1ef4fa7bbcf64 (diff) | |
| download | nextcloud-server-fcfb4205bce86bedefb837431e7abe5194c28cab.tar.gz nextcloud-server-fcfb4205bce86bedefb837431e7abe5194c28cab.zip | |
Fix tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/legacy')
| -rw-r--r-- | lib/private/legacy/app.php | 16 |
1 files changed, 8 insertions, 8 deletions
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); |