// Add a message when a shop is created to indicate that the user should create an URL for this shop + fix some bugs

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8078 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-16 15:53:33 +00:00
parent 8e64aa20e9
commit f6162845ab
5 changed files with 65 additions and 36 deletions
@@ -146,6 +146,10 @@ class ConfigurationCore extends ObjectModel
 		$langID = (int)$langID;
 		if (!isset(self::$_CONF[$langID]))
 			$langID = 0;
+			
+		// If conf if not initialized, try manual query
+		if (!self::$_CONF)
+			return Db::getInstance()->getValue('SELECT `value` FROM '._DB_PREFIX_.'configuration WHERE `name` = \''.pSQL($key).'\'');

 		if ($shopID && Configuration::hasKey($key, $langID, null, $shopID))
 			return self::$_CONF[$langID]['shop'][$shopID][$key];