extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-03 03:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

some fixes to run save_repository() reliable within setup

Browse Source
This commit is contained in:
Ralf Becker 2011-06-14 08:44:24 +00:00
parent 69145c40b5
commit eb6bea34b2
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
phpgwapi/inc/class.preferences.inc.php
View File

@ -693,7 +693,7 @@ class preferences
} }
//echo "<p>preferences::save_repository(,$type): account_id=$account_id, prefs="; print_r($prefs); echo "</p>\n"; //echo "<p>preferences::save_repository(,$type): account_id=$account_id, prefs="; print_r($prefs); echo "</p>\n";
if (!$GLOBALS['egw']->acl->check('session_only_preferences',1,'preferences')) if (isset($GLOBALS['egw_setup']) || !$GLOBALS['egw']->acl->check('session_only_preferences',1,'preferences'))
{ {
$this->db->transaction_begin(); $this->db->transaction_begin();
$this->db->delete($this->table,array('preference_owner' => $account_id),__LINE__,__FILE__); $this->db->delete($this->table,array('preference_owner' => $account_id),__LINE__,__FILE__);
@ -715,13 +715,18 @@ class preferences
} }
$this->db->transaction_commit(); $this->db->transaction_commit();
if (!isset($GLOBALS['egw_setup']))
{
// no need to invalidate session cache, if we write the prefs to the session too // no need to invalidate session cache, if we write the prefs to the session too
$egw = unserialize($_SESSION[egw_session::EGW_OBJECT_CACHE]); $egw = unserialize($_SESSION[egw_session::EGW_OBJECT_CACHE]);
$egw->preferences = $this; $egw->preferences = $this;
$_SESSION[egw_session::EGW_OBJECT_CACHE] = serialize($egw); $_SESSION[egw_session::EGW_OBJECT_CACHE] = serialize($egw);
} }
}
if (!isset($GLOBALS['egw_setup']))
{
$_SESSION[egw_session::EGW_INFO_CACHE]['user']['preferences'] = $GLOBALS['egw_info']['user']['preferences'] = $this->data; $_SESSION[egw_session::EGW_INFO_CACHE]['user']['preferences'] = $GLOBALS['egw_info']['user']['preferences'] = $this->data;
}
return $this->data; return $this->data;
} }