extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-25 08:09:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve detection & removal of empty conditions

Browse Source
This commit is contained in:
Nathan Gray 2010-09-14 22:18:56 +00:00
parent 3b46acda8f
commit 5ed66702ba
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,7 +199,7 @@ class importexport_wizard_basic_import_csv
foreach($content['field_conversion'] as $field => $convert) {
if(!trim($convert)) unset($content['field_conversion'][$field]);
}
switch (array_search('pressed', $content['button']))
{
case 'next':
@ -267,11 +267,11 @@ class importexport_wizard_basic_import_csv
{
array_shift($content['conditions']);
foreach($content['conditions'] as $key => &$condition) {
// Clear empties
if($condition['string'] == '') {
// Clear conditions that don't do anything
foreach($content['conditions'] as $key => $condition) {
if($condition['true']['action'] == 'none' && !$condition['true']['stop']
&& $condition['false']['action'] == 'none' && !$condition['false']['stop']) {
unset($content['conditions'][$key]);
continue;
}
}