summaryrefslogtreecommitdiffstats
path: root/lib/app.php
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-12-06 17:47:28 +0100
committerRobin Appelman <icewind@owncloud.com>2012-12-06 17:47:28 +0100
commit98f42d314ce290002dc2e54ff08992e2cf792777 (patch)
treeec07db5d1ab8abec9bbbc6a50a9ed444b3d644a7 /lib/app.php
parentbe30b1a8de2c7858be3f1dfa792504478af70eb4 (diff)
parent5b04db9b225fd1ed4ad39bef3b77d5fe46b933df (diff)
downloadnextcloud-server-98f42d314ce290002dc2e54ff08992e2cf792777.tar.gz
nextcloud-server-98f42d314ce290002dc2e54ff08992e2cf792777.zip
merge master into filesystem
Diffstat (limited to 'lib/app.php')
-rwxr-xr-xlib/app.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/app.php b/lib/app.php
index b9561b650fc..c6aef3f5b04 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;
}