Allow plugin selection settings to override preferences

This commit is contained in:
Nathan Gray 2011-04-06 22:24:46 +00:00
parent 905900dd41
commit b6e79184a2

View File

@ -190,7 +190,7 @@ class importexport_export_ui {
");
}
if (($prefs = $GLOBALS['egw_info']['user']['preferences']['importexport'][$definition->definition_id]) &&
($prefs = unserialize($prefs)))
($prefs = unserialize($prefs)) && !$content['selection']['plugin_override'])
{
$selection = $content['selection'];
$content = array_merge_recursive($content,$prefs);