summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJoas Schilling <coding@schilljs.com>2017-03-27 10:24:10 +0200
committerJoas Schilling <coding@schilljs.com>2017-03-27 10:24:10 +0200
commit81d87b01fe732d8bdfd3fd77aa42b36c6de9e738 (patch)
treef54887224d2387ecbcbe296a64504b8cf55a47b3 /lib
parentd9ebc2626f0a56cecbc68da4e29c35bb36f62222 (diff)
downloadnextcloud-server-81d87b01fe732d8bdfd3fd77aa42b36c6de9e738.tar.gz
nextcloud-server-81d87b01fe732d8bdfd3fd77aa42b36c6de9e738.zip
Don't spam the log with "Undefined index showInHeader"
Signed-off-by: Joas Schilling <coding@schilljs.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/private/legacy/app.php8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/private/legacy/app.php b/lib/private/legacy/app.php
index 68a8383afbf..56ab59f7238 100644
--- a/lib/private/legacy/app.php
+++ b/lib/private/legacy/app.php
@@ -472,6 +472,7 @@ class OC_App {
$activeAppIndex = -1;
$activeApp = OC::$server->getNavigationManager()->getActiveEntry();
foreach ($list as $index => &$navEntry) {
+ $navEntry['showInHeader'] = true;
if ($navEntry['id'] == $activeApp) {
$navEntry['active'] = true;
$activeAppIndex = $index;
@@ -494,14 +495,11 @@ class OC_App {
}
foreach ($list as $index => &$navEntry) {
- $navEntry['showInHeader'] = false;
- if($index < $headerIconCount) {
- $navEntry['showInHeader'] = true;
+ if($index >= $headerIconCount) {
+ $navEntry['showInHeader'] = false;
}
}
-
-
return $list;
}