From 0e7fb80a3428fcf7857160669f4ea2dbce9efded Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Mon, 11 Apr 2016 14:56:42 +0200
Subject: [PATCH] FIX: We should be able to import value '0'
---
htdocs/core/modules/import/import_csv.modules.php | 2 +-
htdocs/core/modules/import/import_xlsx.modules.php | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index da927dbdbe1..8f25a38d322 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -401,7 +401,7 @@ class ImportCsv extends ModeleImports
// Make some tests on $newval
// Is it a required field ?
- if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ($newval==''))
+ if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval==''))
{
$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
$this->errors[$error]['type']='NOTNULL';
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 47c5fa3feaf..34139820ba8 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -419,7 +419,7 @@ class Importxlsx extends ModeleImports
// Make some tests on $newval
// Is it a required field ?
- if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ($newval==''))
+ if (preg_match('/\*/',$objimport->array_import_fields[0][$val]) && ((string) $newval == ''))
{
$this->errors[$error]['lib']=$langs->trans('ErrorMissingMandatoryValue',$key);
$this->errors[$error]['type']='NOTNULL';
--
GitLab