From 03f13e99dea481c74c59e8a71ded00b6177eafbc Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 7 Dec 2016 11:50:08 +0100 Subject: [PATCH] Fix regression. Icon was not icon of correct element. --- htdocs/imports/import.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php index f86197b82a8..3952cd2d605 100644 --- a/htdocs/imports/import.php +++ b/htdocs/imports/import.php @@ -867,12 +867,13 @@ if ($step == 4 && $datatoimport) print ''; $i++; - $entity=(! empty($objimport->array_import_entities[0][$code])?$objimport->array_import_entities[0][$code]:$objimport->array_import_icon[0]); + $tablealias=preg_replace('/(\..*)$/i','',$code); $tablename=$objimport->array_import_tables[0][$tablealias]; - $entityicon=$entitytoicon[$entity]?$entitytoicon[$entity]:$objimport->array_import_icon[0]; - $entitylang=$entitytolang[$entity]?$entitytolang[$entity]:$objimport->array_import_label[0]; + + $entityicon=$entitytoicon[$entity]?$entitytoicon[$entity]:$entity; // $entityicon must string name of picto of the field like 'project', 'company', 'contact', 'modulename', ... + $entitylang=$entitytolang[$entity]?$entitytolang[$entity]:$objimport->array_import_label[0]; // $entitylang must be a translation key to describe object the field is related to, like 'Company', 'Contact', 'MyModyle', ... print '=>'.img_object('',$entityicon).' '.$langs->trans($entitylang).''; print '';