mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #647 from owncloud/fix_app_settings_navigation 

Move loading of all the apps to setting the active navigation entry.
This commit is contained in:
Thomas Müller 2012-12-05 01:48:20 -08:00
parent 521b6c7b04 8ce3aca331
commit 76625e9ba5
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/app.php
View File

@ -253,6 +253,8 @@ class OC_App{
* highlighting the current position of the user. * highlighting the current position of the user.
*/ */
public static function setActiveNavigationEntry( $id ) { public static function setActiveNavigationEntry( $id ) {
// load all the apps, to make sure we have all the navigation entries
self::loadApps();
self::$activeapp = $id; self::$activeapp = $id;
return true; return true;
} }

1
lib/base.php
View File

@ -512,7 +512,6 @@ class OC{
return; return;
} }
try { try {
OC_App::loadApps();
OC::getRouter()->match(OC_Request::getPathInfo()); OC::getRouter()->match(OC_Request::getPathInfo());
return; return;
} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) { } catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {