composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-24 11:08:45 +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:trunk[2101]
This commit is contained in:
Romain Quetiez
2012-06-14 09:12:56 +00:00
parent cacad13702
commit 1e97829d7d
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
*
* @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'