From 6c09e8328d34300747667b461c3a0db0be8e1462 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Wed, 17 Oct 2012 15:42:19 +0000
Subject: [PATCH] [-] Core : Fix #PSCFV-4986

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17898 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Configuration.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/classes/Configuration.php b/classes/Configuration.php
index ec8c2767b..1a6ac61bd 100644
--- a/classes/Configuration.php
+++ b/classes/Configuration.php
@@ -302,7 +302,12 @@ class ConfigurationCore extends ObjectModel
 			$id_shop_group = Shop::getContextShopGroupID(true);
 
 		if (!is_array($values))
+		{
+			$is_i18n = false;
 			$values = array($values);
+		}
+		else
+			$is_i18n = true;
 
 		$result = true;
 		foreach ($values as $lang => $value)
@@ -364,10 +369,13 @@ class ConfigurationCore extends ObjectModel
 					));
 				}
 			}
-
-			Configuration::set($key, $value, $id_shop_group, $id_shop);
+			if (!$is_i18n)
+				Configuration::set($key, $value, $id_shop_group, $id_shop);
 		}
 
+		if ($is_i18n)
+			Configuration::set($key, $values, $id_shop_group, $id_shop);
+
 		return $result;
 	}