summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-12-09 15:47:51 +0100
committerJoas Schilling <nickvergessen@gmx.de>2013-12-09 15:53:31 +0100
commit009e25788f3ad3118e2c72935ffee6591c0bc17b (patch)
treed8450ec962ae31e035b4333b7d1bb2d46d88ff4e
parentcec17fd3e2f53b987d9c51497a5aa9f959710f3c (diff)
downloadnextcloud-server-009e25788f3ad3118e2c72935ffee6591c0bc17b.tar.gz
nextcloud-server-009e25788f3ad3118e2c72935ffee6591c0bc17b.zip
correctly mark app management active
-rw-r--r--core/templates/layout.user.php2
-rw-r--r--lib/private/templatelayout.php1
2 files changed, 2 insertions, 1 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9e1d8022ecb..717edf28243 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -104,7 +104,7 @@
<?php if(OC_User::isAdminUser(OC_User::getUser())): ?>
<li id="apps-management">
<a href="<?php print_unescaped(OC_Helper::linkToRoute('settings_apps').'?installed'); ?>" title=""
- <?php if( $entry['active'] ): ?> class="active"<?php endif; ?>>
+ <?php if( $_['appsmanagement_active'] ): ?> class="active"<?php endif; ?>>
<img class="icon svg" src="<?php print_unescaped(OC_Helper::imagePath('settings', 'apps.svg')); ?>"/>
<span>
<?php p($l->t('Apps')); ?>
diff --git a/lib/private/templatelayout.php b/lib/private/templatelayout.php
index 625f3424a04..d5cd5039753 100644
--- a/lib/private/templatelayout.php
+++ b/lib/private/templatelayout.php
@@ -46,6 +46,7 @@ class OC_TemplateLayout extends OC_Template {
$user_displayname = OC_User::getDisplayName();
$this->assign( 'user_displayname', $user_displayname );
$this->assign( 'user_uid', OC_User::getUser() );
+ $this->assign( 'appsmanagement_active', strpos(OC_Request::requestUri(), OC_Helper::linkToRoute('settings_apps')) === 0 );
$this->assign('enableAvatars', \OC_Config::getValue('enable_avatars', true));
} else if ($renderas == 'guest' || $renderas == 'error') {
parent::__construct('core', 'layout.guest');