// Fix some bug on multishop + improve display of shop pages

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@10518 b9a71923-0436-4b27-9f14-aed3839534dd
2011-11-23 13:09:23 +00:00
parent 7c7eda3167
commit 0f87f86203
8 changed files with 104 additions and 40 deletions
@@ -507,9 +507,9 @@ class ShopCore extends ObjectModel
 				if ((!$active || $shop_data['active']) && (!$id_group_shop || $id_group_shop == $group_id))
 				{
 					if ($get_as_list_id)
-						$results[] = $id;
+						$results[$id] = $id;
 					else
-						$results[] = $shop_data;
+						$results[$id] = $shop_data;
 				}
 		return $results;
 	}
@@ -869,7 +869,7 @@ class ShopCore extends ObjectModel
 	{
 		return (int)Db::getInstance()->getValue(sprintf('SELECT COUNT(*) FROM`'._DB_PREFIX_.'group_shop` WHERE `id_group_shop` = %d', (int)$id));
 	}
-	
+
 	public static function getShopWithoutUrls($id_shop = false)
 	{
 		$without = array();