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

Do not consider stop flag when clearing empty conditions

Browse Source
This commit is contained in:
Nathan Gray 2012-11-26 18:07:13 +00:00
parent 284a644069
commit 90d5428b9e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
View File

@ -368,8 +368,10 @@ class importexport_wizard_basic_import_csv
// Clear conditions that don't do anything // Clear conditions that don't do anything
array_shift($content['conditions']); array_shift($content['conditions']);
foreach($content['conditions'] as $key => &$condition) { foreach($content['conditions'] as $key => &$condition) {
if(($condition['true']['action'] == 'none' || !$condition['true']['action']) && !$condition['true']['stop'] if(($condition['true']['action'] == 'none' || !$condition['true']['action'])
&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) && !$condition['false']['stop']) { && ($condition['false']['action'] == 'none' || !$condition['false']['action']) &&
!$condition['string']
) {
unset($content['conditions'][$key]); unset($content['conditions'][$key]);
continue; continue;
} }