correctly mark app management active

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9e1d8022ecbef3a14c0dc65a0e42e4d7d05a719e..717edf28243410c64d69a8e78d8d4bb3ade4a2b5 100644 (file)
--- 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 625f3424a0473ce9dbde867bdb276683df6b9fb9..d5cd50397536aea3c76791d4faf5a6a9b45a0805 100644 (file)
--- 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');