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.
owncloud · Nov 30, 2012 · 8ce3aca · 8ce3aca
1 parent 9717cdb
commit 8ce3aca
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/app.php b/lib/app.php
@@ -253,6 +253,8 @@ public static function addNavigationEntry( $data ) {
 	 * 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
@@ -512,7 +512,6 @@ public static function handleRequest() {
 			return;
 		}
 		try {
-			OC_App::loadApps();
 			OC::getRouter()->match(OC_Request::getPathInfo());
 			return;
 		} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -512,7 +512,6 @@ public static function handleRequest() { @@
     			return;
     		}
     		try {
-    			OC_App::loadApps();
     			OC::getRouter()->match(OC_Request::getPathInfo());
     			return;
     		} catch (Symfony\Component\Routing\Exception\ResourceNotFoundException $e) {
@@ Expand Down @@