Merge pull request #6098 from atm-florian/develop

FIX : Do not include separate extrafields into export
This commit is contained in:
Laurent Destailleur
2016-12-10 11:30:00 +01:00
committed by GitHub

View File

@@ -42,9 +42,11 @@ if ($resql) // This can fail when class is used on old database (during migra
if (preg_match('/[a-z0-9_]+:[a-z0-9_]+:[a-z0-9_]+/', $tmp)) $typeFilter="List:".$tmp;
break;
}
$this->export_fields_array[$r][$fieldname]=$fieldlabel;
$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
$this->export_entities_array[$r][$fieldname]=$keyforelement;
if ($obj->type!='separate') {
$this->export_fields_array[$r][$fieldname]=$fieldlabel;
$this->export_TypeFields_array[$r][$fieldname]=$typeFilter;
$this->export_entities_array[$r][$fieldname]=$keyforelement;
}
}
}
// End add axtra fields