From 9600c89a1f515bcded66d376a482978143244072 Mon Sep 17 00:00:00 2001 From: Romain Quetiez Date: Thu, 14 Jun 2012 09:12:25 +0000 Subject: [PATCH] Fixed regression (See #556) due to the existence of an overload of the protected API GetUserOrgs, reintegrated from branch 1.2.1 SVN:1.2[2100] --- addons/userrights/userrightsprofile.class.inc.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/userrights/userrightsprofile.class.inc.php b/addons/userrights/userrightsprofile.class.inc.php index c0c0235bbe..edd8693e67 100644 --- a/addons/userrights/userrightsprofile.class.inc.php +++ b/addons/userrights/userrightsprofile.class.inc.php @@ -613,9 +613,13 @@ class UserRightsProfile extends UserRightsAddOnAPI /** * Read and cache organizations allowed to the given user + * + * @param oUser + * @param sClass -not used here but can be used in overloads */ - protected function GetUserOrgs($iUser) + protected function GetUserOrgs($oUser, $sClass) { + $iUser = $oUser->GetKey(); if (!array_key_exists($iUser, $this->m_aUserOrgs)) { $this->m_aUserOrgs[$iUser] = array(); @@ -811,7 +815,7 @@ exit; } // Position the user // - $aUserOrgs = $this->GetUserOrgs($oUser->GetKey()); + $aUserOrgs = $this->GetUserOrgs($oUser, $sClass); if (count($aUserOrgs) == 0) { // No org means 'any org'