diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-30 22:59:55 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-30 22:59:55 +0100 |
| commit | 6e9e2634978f08494a13bb3c5185032fc0ed7792 (patch) | |
| tree | 8f0cf5eef65c29715c84b2c253834a2fa047bbd7 /lib/app.php | |
| parent | 890fbb82993db294489fb6ecf14d91d7652763d1 (diff) | |
| parent | 6738275b01abf514d32171da604da8d63a2808e0 (diff) | |
| download | nextcloud-server-6e9e2634978f08494a13bb3c5185032fc0ed7792.tar.gz nextcloud-server-6e9e2634978f08494a13bb3c5185032fc0ed7792.zip | |
merge master into filesystem
Diffstat (limited to 'lib/app.php')
| -rwxr-xr-x | lib/app.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/lib/app.php b/lib/app.php index b05d841e63b..51f47767540 100755 --- a/lib/app.php +++ b/lib/app.php @@ -319,7 +319,6 @@ class OC_App{ /// This is private as well. It simply works, so don't ask for more details private static function proceedNavigation( $list ) { foreach( $list as &$naventry ) { - $naventry['subnavigation'] = array(); if( $naventry['id'] == self::$activeapp ) { $naventry['active'] = true; } @@ -469,8 +468,6 @@ class OC_App{ * entries are sorted by the key 'order' ascending. Additional to the keys * given for each app the following keys exist: * - active: boolean, signals if the user is on this navigation entry - * - children: array that is empty if the key 'active' is false or - * contains the subentries if the key 'active' is true */ public static function getNavigation() { $navigation = self::proceedNavigation( self::$navigation ); |