Fix: avoid errors

This commit is contained in:
Regis Houssin 2012-12-06 10:43:27 +01:00
parent 084bd3a4a8
commit 50206bbd73

View File

@ -817,7 +817,7 @@ if ($step == 4 && $datatoexport)
$list=''; $list='';
foreach($array_selected as $code=>$value) foreach($array_selected as $code=>$value)
{ {
$list.=($list?', ':''); $list.=(! empty($list)?', ':'');
$list.=$langs->trans($objexport->array_export_fields[0][$code]); $list.=$langs->trans($objexport->array_export_fields[0][$code]);
} }
print '<td>'.$list.'</td>'; print '<td>'.$list.'</td>';
@ -828,6 +828,8 @@ if ($step == 4 && $datatoexport)
{ {
print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>'; print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>';
$list=''; $list='';
if (! empty($array_filtervalue))
{
foreach($array_filtervalue as $code=>$value) foreach($array_filtervalue as $code=>$value)
{ {
if (isset($objexport->array_export_fields[0][$code])) if (isset($objexport->array_export_fields[0][$code]))
@ -836,7 +838,8 @@ if ($step == 4 && $datatoexport)
$list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'"; $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
} }
} }
print '<td>'.($list?$list:$langs->trans("None")).'</td>'; }
print '<td>'.(! empty($list)?$list:$langs->trans("None")).'</td>';
print '</tr>'; print '</tr>';
} }
@ -1046,7 +1049,7 @@ if ($step == 5 && $datatoexport)
$list=''; $list='';
foreach($array_selected as $code=>$label) foreach($array_selected as $code=>$label)
{ {
$list.=($list?', ':''); $list.=(! empty($list)?', ':'');
$list.=$langs->trans($objexport->array_export_fields[0][$code]); $list.=$langs->trans($objexport->array_export_fields[0][$code]);
} }
print '<td>'.$list.'</td></tr>'; print '<td>'.$list.'</td></tr>';
@ -1056,6 +1059,8 @@ if ($step == 5 && $datatoexport)
{ {
print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>'; print '<tr><td width="25%">'.$langs->trans("FilteredFields").'</td>';
$list=''; $list='';
if (! empty($array_filtervalue))
{
foreach($array_filtervalue as $code=>$value) foreach($array_filtervalue as $code=>$value)
{ {
if (isset($objexport->array_export_fields[0][$code])) if (isset($objexport->array_export_fields[0][$code]))
@ -1064,7 +1069,8 @@ if ($step == 5 && $datatoexport)
$list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'"; $list.=$langs->trans($objexport->array_export_fields[0][$code])."='".(isset($array_filtervalue[$code])?$array_filtervalue[$code]:'')."'";
} }
} }
print '<td>'.($list?$list:$langs->trans("None")).'</td>'; }
print '<td>'.(! empty($list)?$list:$langs->trans("None")).'</td>';
print '</tr>'; print '</tr>';
} }