From 5100dfcc7185ec840e7ecec79bc531a21a8ba8f6 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 29 Jun 2012 07:14:46 +0000 Subject: [PATCH] * Password: fixed not working check, if user has right to change password, causing password link in topmenu to be displayed when not in preferences app --- phpgwapi/inc/class.egw_framework.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index dd14df5546..37d6b5a570 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -934,10 +934,10 @@ abstract class egw_framework { $this->_add_topmenu_item($apps['preferences']); } - // allways display pasword in topmenu + // allways display password in topmenu, if user has rights to change it if((($pw_app = $GLOBALS['egw_info']['user']['apps']['preferences']) || ($pw_app = $GLOBALS['egw_info']['user']['apps']['password'])) && - !$GLOBALS['egw']->acl->check('nopasswordchange', 1)) + !$GLOBALS['egw']->acl->check('nopasswordchange', 1, 'preferences')) { $this->_add_topmenu_item(array( 'name' => $pw_app['name'] == 'password' ? 'about' : $pw_app['name'],