// oops

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7901 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-05 08:31:37 +00:00
parent 3e090ce36d
commit 9066b7e8c4
1 changed files with 6 additions and 2 deletions
@@ -369,6 +369,8 @@ class ShopCore extends ObjectModel
 					self::$shops[$row['id_group_shop']] = array(
 						'id' =>				$row['id_group_shop'],
 						'name' => 			$row['group_name'],
+						'share_customer' =>	$row['share_customer'],
+						'share_order' =>	$row['share_order'],
 						'share_stock' =>	$row['share_stock'],
 						'shops' => 			array(),
 					);
@@ -478,6 +480,9 @@ class ShopCore extends ObjectModel
 			die('Wrong argument ($type) in Shop::getSharedShops() method');

 		Shop::cacheShops();
+		foreach (self::$shops as $groupData)
+			if (array_key_exists($shopID, $groupData['shops']) && $groupData[$type])
+				return array_keys($groupData['shops']);
 		return array($shopID);
 	}

@@ -741,5 +746,4 @@ class ShopCore extends ObjectModel
 			}
 		}
 	}
-}
-
+}