From d50999fde0e0a6b4693b8656bb81bdeec6380ca7 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Thu, 5 Dec 2013 17:17:35 +0100
Subject: [PATCH] =?UTF-8?q?[-]=20Core:=20Fix=C2=A0#PSCFV-11165=20numerical?=
 =?UTF-8?q?=20configuration=20values=20should=20not=20be=20overridden=20if?=
 =?UTF-8?q?=20the=20value=20is=20the=20same=20between=20shop=20and=20globa?=
 =?UTF-8?q?l=20context?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 classes/Configuration.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/classes/Configuration.php b/classes/Configuration.php
index dc623e3f0..570435a2f 100644
--- a/classes/Configuration.php
+++ b/classes/Configuration.php
@@ -314,7 +314,8 @@ class ConfigurationCore extends ObjectModel
 		$result = true;
 		foreach ($values as $lang => $value)
 		{
-			if ($value === Configuration::get($key, $lang, $id_shop_group, $id_shop))
+			$stored_value = Configuration::get($key, $lang, $id_shop_group, $id_shop);
+			if ((!is_numeric($value) && $value === $stored_value) || (is_numeric($value) && $value == $stored_value))
 				continue;
 
 			// If key already exists, update value