aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/private/AppFramework/App.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/private/AppFramework/App.php b/lib/private/AppFramework/App.php
index 01844e4c2d5..c7670953b4e 100644
--- a/lib/private/AppFramework/App.php
+++ b/lib/private/AppFramework/App.php
@@ -93,7 +93,13 @@ class App {
try {
$controller = $container->query($controllerName);
} catch(QueryException $e) {
- $appNameSpace = self::buildAppNamespace($appName);
+ if ($appName === 'core') {
+ $appNameSpace = 'OC\\Core';
+ } else if ($appName === 'settings') {
+ $appNameSpace = 'OC\\Settings';
+ } else {
+ $appNameSpace = self::buildAppNamespace($appName);
+ }
$controllerName = $appNameSpace . '\\Controller\\' . $controllerName;
$controller = $container->query($controllerName);
}