extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-09 15:38:27 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed merging of session and user prefs

Browse Source
This commit is contained in:
Ralf Becker 2004-03-21 22:03:06 +00:00
parent 30d02e3cc4
commit 745bfdc35e
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,7 +247,17 @@
break;
}
}
$this->data = array_merge_recursive($this->user,$this->session);
$this->data = $this->user;
// let the (temp.) session prefs. override the user prefs.
//
foreach($this->session as $app => $values)
{
foreach($values as $var => $value)
{
$this->data[$app][$var] = $value;
}
}
// now use defaults if needed (user-value unset or empty)
//