Do not consider stop flag when clearing empty conditions

This commit is contained in:
Nathan Gray 2012-11-26 18:07:13 +00:00
parent 284a644069
commit 90d5428b9e

View File

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