composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-05-19 23:32:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed regression (See #556) due to the existence of an overload of the protected API GetUserOrgs, reintegrated from branch 1.2.1

Browse Source 
SVN:1.2[2100]
This commit is contained in:
Romain Quetiez
2012-06-14 09:12:25 +00:00
parent d01202ba33
commit 9600c89a1f
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
addons/userrights/userrightsprofile.class.inc.php
View File

@@ -613,9 +613,13 @@ class UserRightsProfile extends UserRightsAddOnAPI
/** /**
* Read and cache organizations allowed to the given user * 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)) if (!array_key_exists($iUser, $this->m_aUserOrgs))
{ {
$this->m_aUserOrgs[$iUser] = array(); $this->m_aUserOrgs[$iUser] = array();
@@ -811,7 +815,7 @@ exit;
} }
// Position the user // Position the user
// //
$aUserOrgs = $this->GetUserOrgs($oUser->GetKey()); $aUserOrgs = $this->GetUserOrgs($oUser, $sClass);
if (count($aUserOrgs) == 0) if (count($aUserOrgs) == 0)
{ {
// No org means 'any org' // No org means 'any org'