From d99b17903f4ea413c6f4623ed5b840149572a1a8 Mon Sep 17 00:00:00 2001
From: rMalie <raphael.malie@prestashop.com>
Date: Tue, 10 Apr 2012 16:04:04 +0000
Subject: [PATCH] // Optimization

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

diff --git a/classes/Configuration.php b/classes/Configuration.php
index 8eab6fc3d..40d7d0b4e 100644
--- a/classes/Configuration.php
+++ b/classes/Configuration.php
@@ -124,8 +124,12 @@ class ConfigurationCore extends ObjectModel
 					'shop' => array(),
 				);
 
-			// Do not remove (int) cast
-			Configuration::set($row['name'], array($lang => $row['value']), (int)$row['id_group_shop'], (int)$row['id_shop']);
+			if ($row['id_shop'])
+				self::$_CONF[$lang]['shop'][$row['id_shop']][$row['name']] = $row['value'];
+			else if ($row['id_shop_group'])
+				self::$_CONF[$lang]['group'][$row['id_shop_group']][$row['name']] = $row['value'];
+			else
+				self::$_CONF[$lang]['global'][$row['name']] = $row['value'];
 		}
 	}