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.

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 dff73ef1ae8..f600800b617 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) {