From 2303677ebf610e0bd274fde967807a5a960ac58f Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Tue, 6 Aug 2013 16:52:13 +0200 Subject: [PATCH] // Rollback a modification in object model --- classes/ObjectModel.php | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/classes/ObjectModel.php b/classes/ObjectModel.php index 3207009e2..812c9010a 100644 --- a/classes/ObjectModel.php +++ b/classes/ObjectModel.php @@ -858,15 +858,13 @@ abstract class ObjectModelCore continue; $values = $this->$field; + + // If the object has not been loaded in multilanguage, then the value is the one for the current language of the object if (!is_array($values)) - { - $value = $values; - $values = array(); - $values[$this->id_lang] = $value; - $values[Configuration::get('PS_LANG_DEFAULT')] = $value; - } + $values = array($this->id_lang => $values); - if (!isset($values[Configuration::get('PS_LANG_DEFAULT')])) + // The value for the default must always be set, so we put an empty string if it does not exists + if (!isset($values[Configuration::get('PS_LANG_DEFAULT')])) $values[Configuration::get('PS_LANG_DEFAULT')] = ''; foreach ($values as $id_lang => $value)