extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-26 07:49:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow plugin selection settings to override preferences

Browse Source
This commit is contained in:
Nathan Gray 2011-04-06 22:24:46 +00:00
parent 905900dd41
commit b6e79184a2
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

@ -190,7 +190,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['selection']['plugin_override'])
{ {
$selection = $content['selection']; $selection = $content['selection'];
$content = array_merge_recursive($content,$prefs); $content = array_merge_recursive($content,$prefs);