Give user preference for selection precidence over plugin setting

This commit is contained in:
Nathan Gray 2011-03-28 21:12:44 +00:00
parent 9b072a81a7
commit 55ba81f0de

View File

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