diff options
| author | Frank Karlitschek <frank@owncloud.org> | 2013-12-20 02:27:52 -0800 |
|---|---|---|
| committer | Frank Karlitschek <frank@owncloud.org> | 2013-12-20 02:27:52 -0800 |
| commit | dc45141f4abfedb10d6f908143b7a75e1ada6406 (patch) | |
| tree | b26241a5e639e25324e80d61325d650c666abddb | |
| parent | 371a476eb5c9192349cdcfbcf81e002ce47a837e (diff) | |
| parent | 009e25788f3ad3118e2c72935ffee6591c0bc17b (diff) | |
| download | nextcloud-server-dc45141f4abfedb10d6f908143b7a75e1ada6406.tar.gz nextcloud-server-dc45141f4abfedb10d6f908143b7a75e1ada6406.zip | |
Merge pull request #6262 from nickvergessen/issue/4375
correctly mark app management active
| -rw-r--r-- | core/templates/layout.user.php | 2 | ||||
| -rw-r--r-- | lib/private/templatelayout.php | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index 45b7e39686d..89987625d63 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -105,7 +105,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'); |