extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-27 00:58:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixe PHP Fatal error in preferences::copy_preferences() in mail install

Browse Source
This commit is contained in:
Ralf Becker 2014-07-22 16:52:22 +00:00
parent f2ca4d2762
commit b3c2bebd5f
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -810,6 +810,7 @@ class preferences
*/ */
public static function copy_preferences($from_app, $to_app, array $names=null) public static function copy_preferences($from_app, $to_app, array $names=null)
{ {
//error_log(__METHOD__."('$from_app', '$to_app', ".array2string($names).')');
$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db; $db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
foreach($db->select(self::TABLE, '*', array('preference_app' => $from_app), __LINE__, __FILE__) as $row) foreach($db->select(self::TABLE, '*', array('preference_app' => $from_app), __LINE__, __FILE__) as $row)
@ -825,12 +826,13 @@ class preferences
$row['preference_app'] = $to_app; $row['preference_app'] = $to_app;
unset($row['preference_value']); unset($row['preference_value']);
if (($values = $this->db->select(self::TABLE, 'preference_value', $row, __LINE__, __FILE__)->fetchColumn())) if (($values = $db->select(self::TABLE, 'preference_value', $row, __LINE__, __FILE__)->fetchColumn()))
{ {
$prefs = array_merge($values, $prefs); $prefs = array_merge(self::unserialize($values), $prefs);
} }
$this->db->insert(self::TABLE, array( //error_log(__LINE__.': '.__METHOD__."() inserting app=$row[preference_app], owner=$row[preference_owner]: ".array2string($prefs));
$db->insert(self::TABLE, array(
'preference_value' => json_encode($prefs) 'preference_value' => json_encode($prefs)
), $row, __LINE__, __FILE__); ), $row, __LINE__, __FILE__);