extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 08:38:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

try fixing race-condition: Call to a member function exists() on null

Browse Source
This commit is contained in:
ralf 2024-02-01 09:45:10 +02:00
parent eeb62670ad
commit e6710a9bc3
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
api/src/loader/common.php
View File

@ -291,37 +291,37 @@ if (file_exists(EGW_SERVER_ROOT.'/phpgwapi'))
* @author skeeter
* This function will return a properly formatted account_id. This can take either a name or an account_id as paramters. If a name is provided it will return the associated id.
* $account_id = get_account_id($accountid);
* @param int/string $account_id either a name or an id
* @param int/string $default_id either a name or an id
* @param int|string $account_id either a name or an id
* @param int|string $default_id either a name or an id
* @return int account_id
*/
function get_account_id($account_id = '',$default_id = '')
{
if (gettype($account_id) == 'integer')
if (is_int($account_id))
{
return $account_id;
}
elseif ($account_id == '')
if ($account_id == '')
{
if ($default_id == '')
{
return (isset($GLOBALS['egw_info']['user']['account_id'])?$GLOBALS['egw_info']['user']['account_id']:0);
return $GLOBALS['egw_info']['user']['account_id'] ?? 0;
}
elseif (is_string($default_id))
{
return $GLOBALS['egw']->accounts->name2id($default_id);
return Api\Accounts::getInstance()->name2id($default_id);
}
return (int)$default_id;
}
elseif (is_string($account_id))
{
if((int)$account_id && $GLOBALS['egw']->accounts->exists((int)$account_id) == True)
if((int)$account_id && Api\Accounts::getInstance()->exists((int)$account_id))
{
return (int)$account_id;
}
else
{
return $GLOBALS['egw']->accounts->name2id($account_id);
return Api\Accounts::getInstance()->name2id($account_id);
}
}
}
@ -433,4 +433,4 @@ if (!function_exists('display_sidebox'))
}, $_file);
$GLOBALS['egw']->framework->sidebox($appname,$menu_title,$file);
}
}
}