diff --git a/htdocs/exports/export.class.php b/htdocs/exports/export.class.php index 2464b2a0278..a8a6c96c037 100644 --- a/htdocs/exports/export.class.php +++ b/htdocs/exports/export.class.php @@ -118,11 +118,15 @@ class Export $this->array_export_alias[$i]=$module->export_alias_array[$r]; // Charge fichier lang en rapport - foreach($module->getLangFilesArray() as $key) + $langtoload=$module->getLangFilesArray(); + if (is_array($langtoload)) { - $langs->load($key); + foreach($langtoload as $key) + { + $langs->load($key); + } } - + dolibarr_syslog("Export chargé pour le module ".$modulename." en index ".$i.", dataset=".$module->export_code[$r].", nbre de champs=".sizeof($module->export_fields_code[$r])); $i++; } diff --git a/htdocs/exports/export.php b/htdocs/exports/export.php index a747711a90d..09a5cf7b58d 100644 --- a/htdocs/exports/export.php +++ b/htdocs/exports/export.php @@ -91,9 +91,12 @@ if ($action=='downfield' || $action=='upfield') } } //print("Switch pos=$pos (code=".$_GET["field"].") and newpos=$newpos (code=$newcode)"); - $array_selected[$_GET["field"]]=$newpos; - $array_selected[$newcode]=$pos; - $_SESSION["export_selected_fields"]=$array_selected; + if ($newcode) // Si newcode trouvé (prtoection contre resoumission de page + { + $array_selected[$_GET["field"]]=$newpos; + $array_selected[$newcode]=$pos; + $_SESSION["export_selected_fields"]=$array_selected; + } } if ($step == 1 || $action == 'cleanselect')