// Fix during language install (now support table with uppercase prefix on windows)

// Add is_native to hook table in db.sql file git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@9989 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-09 15:01:12 +00:00
parent fd4d790a32
commit d38bbc2ea5
4 changed files with 8 additions and 5 deletions
@@ -58,7 +58,7 @@ class ShopCore extends ObjectModel
 	protected $identifier = 'id_shop';

 	/** @var array List of shops cached */
-	protected static $shops = array();
+	protected static $shops;

 	private	static $asso_tables = array(
 		'carrier' => 				array('type' => 'shop'),
@@ -403,9 +403,11 @@ class ShopCore extends ObjectModel
 	 */
 	public static function cacheShops($refresh = false)
 	{
-		if (self::$shops && !$refresh)
+		if (!is_null(self::$shops) && !$refresh)
 			return;

+		self::$shops = array();
+
 		$select = '';
 		$from = '';
 		$where = '';