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

Merge recursive to preserve sub-arrays

Browse Source
This commit is contained in:
Nathan Gray 2011-03-14 20:39:54 +00:00
parent f6571e3446
commit 93241a65c5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
importexport/inc/class.importexport_export_ui.inc.php
View File

@ -192,7 +192,7 @@ class importexport_export_ui {
if (($prefs = $GLOBALS['egw_info']['user']['preferences']['importexport'][$definition->definition_id]) && if (($prefs = $GLOBALS['egw_info']['user']['preferences']['importexport'][$definition->definition_id]) &&
($prefs = unserialize($prefs))) ($prefs = unserialize($prefs)))
{ {
$content = array_merge($content,$prefs); $content = array_merge_recursive($content,$prefs);
} }
unset ($plugin_object); unset ($plugin_object);
(array)$apps = importexport_helper_functions::get_apps('export'); (array)$apps = importexport_helper_functions::get_apps('export');