forked from extern/egroupware
fix for bug [ 1357995 ] LDAP account import errors
This commit is contained in:
parent
1549913fd7
commit
2dbaf992fa
@ -374,7 +374,10 @@
|
||||
//echo "<p>accounts::cache_invalidate($account_id)</p>\n";
|
||||
$GLOBALS['egw_info']['accounts']['cache'] = array();
|
||||
|
||||
$GLOBALS['egw']->invalidate_session_cache(); // invalidates whole egw-enviroment if stored in the session
|
||||
if (method_exists($GLOBALS['egw'],'invalidate_session_cache')) // egw object in setup is limited
|
||||
{
|
||||
$GLOBALS['egw']->invalidate_session_cache(); // invalidates whole egw-enviroment if stored in the session
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -34,11 +34,18 @@
|
||||
var $account_id;
|
||||
var $data;
|
||||
var $total;
|
||||
var $table = 'egw_accounts';
|
||||
|
||||
function accounts_()
|
||||
{
|
||||
$this->db = clone($GLOBALS['egw']->db);
|
||||
$this->table = 'egw_accounts';
|
||||
if (is_object($GLOBALS['egw_setup']))
|
||||
{
|
||||
$this->db = clone($GLOBALS['egw_setup']->db);
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->db = clone($GLOBALS['egw']->db);
|
||||
}
|
||||
$this->db->set_app('phpgwapi'); // to load the right table-definitions for insert, select, update, ...
|
||||
}
|
||||
|
||||
|
@ -50,7 +50,14 @@
|
||||
*/
|
||||
function applications($account_id = '')
|
||||
{
|
||||
$this->db = clone($GLOBALS['egw']->db);
|
||||
if (is_object($GLOBALS['egw_setup']))
|
||||
{
|
||||
$this->db = clone($GLOBALS['egw_setup']->db);
|
||||
}
|
||||
else
|
||||
{
|
||||
$this->db = clone($GLOBALS['egw']->db);
|
||||
}
|
||||
$this->db->set_app('phpgwapi');
|
||||
|
||||
$this->account_id = get_account_id($account_id);
|
||||
|
Loading…
Reference in New Issue
Block a user