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:
commit
76625e9ba5
|
@ -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;
|
||||||
}
|
}
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
Loading…
Reference in New Issue