From 168759a38349230af6658d98ffbdf8f70c6063f6 Mon Sep 17 00:00:00 2001
From: Damien Metzger <damien.metzger@prestashop.com>
Date: Wed, 31 Jul 2013 18:40:11 +0200
Subject: [PATCH] // Stock performance optimization

---
 classes/stock/StockAvailable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/stock/StockAvailable.php b/classes/stock/StockAvailable.php
index fbdaa1a2f..12e23cd39 100644
--- a/classes/stock/StockAvailable.php
+++ b/classes/stock/StockAvailable.php
@@ -680,7 +680,7 @@ class StockAvailableCore extends ObjectModel
 
 		// if there is no $id_shop, gets the context one
 		// get shop group too
-		if ($shop === null)
+		if ($shop === null || $shop === $context->shop->id)
 		{
 			if (Shop::getContext() == Shop::CONTEXT_GROUP)
 				$shop_group = Shop::getContextShopGroup();