diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2012-12-05 01:48:20 -0800 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2012-12-05 01:48:20 -0800 |
| commit | 76625e9ba59481a0dfa4c92453f630451c098844 (patch) | |
| tree | 8c20ed740f90216c74361fad0b95720e08dacad6 | |
| parent | 521b6c7b049ebd8ce1cf61017f160fb693429dd6 (diff) | |
| parent | 8ce3aca3315f9fc9db8e6210fa4e894c5d1d3577 (diff) | |
| download | nextcloud-server-76625e9ba59481a0dfa4c92453f630451c098844.tar.gz nextcloud-server-76625e9ba59481a0dfa4c92453f630451c098844.zip | |
Merge pull request #647 from owncloud/fix_app_settings_navigation
Move loading of all the apps to setting the active navigation entry.
| -rwxr-xr-x | lib/app.php | 2 | ||||
| -rw-r--r-- | lib/base.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/lib/app.php b/lib/app.php index 79c1d83314f..5d4fbbd9c23 100755 --- a/lib/app.php +++ b/lib/app.php @@ -253,6 +253,8 @@ class OC_App{ * highlighting the current position of the user. */ public static function setActiveNavigationEntry( $id ) { + // load all the apps, to make sure we have all the navigation entries + self::loadApps(); self::$activeapp = $id; return true; } diff --git a/lib/base.php b/lib/base.php index 8c508c48767..273107e9b8a 100644 --- a/lib/base.php +++ b/lib/base.php @@ -512,7 +512,6 @@ class OC{ return; } try { - OC_App::loadApps(); OC::getRouter()->match(OC_Request::getPathInfo()); return; } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) { |