fix not working forced password change on login screen

This commit is contained in:
Ralf Becker 2016-07-15 14:47:13 +02:00
parent f4521e3401
commit f4acec1b82

View File

@ -216,8 +216,15 @@ class Ads implements Backend
if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login') if(!$account_id || $GLOBALS['egw_info']['flags']['currentapp'] == 'login')
{ {
$admin = false; $admin = false;
$username = $GLOBALS['egw_info']['user']['account_lid']; if (!empty($GLOBALS['egw_info']['user']['account_id']) && $GLOBALS['egw_info']['user']['account_id'] > 0)
$account_id = $GLOBALS['egw_info']['user']['account_id']; {
$username = $GLOBALS['egw_info']['user']['account_lid'];
$account_id = $GLOBALS['egw_info']['user']['account_id'];
}
else
{
$username = $GLOBALS['egw']->accounts->id2name($account_id);
}
} }
else else
{ {