Move loading of all the apps to setting the active navigation entry.

We can't do the loading before matching the route, because some routes
need to do the loading after matching of the route. For example the
navigation detection of the app settings page.
remotes/origin/stable5
Bart Visscher 12 years ago
parent 9717cdb42e
commit 8ce3aca331
  1. 2
      lib/app.php
  2. 1
      lib/base.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;
}

@ -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) {

Loading…
Cancel
Save