summaryrefslogtreecommitdiffstats
path: root/lib/private/AppFramework
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-03-22 11:50:31 +0100
committerJoas Schilling <coding@schilljs.com>2017-03-22 11:50:31 +0100
commit3f86f1276f69fb97f0c2c2a6e133152e695e2d9b (patch)
tree2d26f9ea1c4d73ffab6e12242e522040380daf05 /lib/private/AppFramework
parent8b94fbe0140918e6c330d7111f42d86f73f76744 (diff)
downloadnextcloud-server-3f86f1276f69fb97f0c2c2a6e133152e695e2d9b.tar.gz
nextcloud-server-3f86f1276f69fb97f0c2c2a6e133152e695e2d9b.zip
Also cache the namespace from appinfo
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib/private/AppFramework')
-rw-r--r--lib/private/AppFramework/App.php7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php
index e15e4a797ea..5a7bc8fad43 100644
--- a/lib/private/AppFramework/App.php
+++ b/lib/private/AppFramework/App.php
@@ -61,11 +61,12 @@ class App {
$appInfo = \OC_App::getAppInfo($appId);
if (isset($appInfo['namespace'])) {
- return $topNamespace . trim($appInfo['namespace']);
+ self::$nameSpaceCache[$appId] = trim($appInfo['namespace']);
+ } else {
+ // if the tag is not found, fall back to uppercasing the first letter
+ self::$nameSpaceCache[$appId] = ucfirst($appId);
}
- // if the tag is not found, fall back to uppercasing the first letter
- self::$nameSpaceCache[$appId] = ucfirst($appId);
return $topNamespace . self::$nameSpaceCache[$appId];
}