From 9ca9928c58a7fac431b6fc4b817e2ce66b25004b Mon Sep 17 00:00:00 2001 From: gRoussac Date: Mon, 5 Aug 2013 17:17:22 +0200 Subject: [PATCH] [-] CORE : Fix for field validation in ObjectModel::validateFieldsLang() when default lang value not set, thanks @rimas-kudelis --- classes/ObjectModel.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 3cf6dfc7b..49c7440fe 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -858,8 +858,14 @@ abstract class ObjectModelCore $values = $this->$field; if (!is_array($values)) - $values = array($this->id_lang => $values); - if (!isset($values[Configuration::get('PS_LANG_DEFAULT')])) + { + $value = $values; + $values = array(); + $values[$this->id_lang] = $value; + $values[Configuration::get('PS_LANG_DEFAULT')] = $value; + } + + if (!isset($values[Configuration::get('PS_LANG_DEFAULT')])) $values[Configuration::get('PS_LANG_DEFAULT')] = ''; foreach ($values as $id_lang => $value)