// Fix #PSCFV-4676

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17740 b9a71923-0436-4b27-9f14-aed3839534dd
2012-10-03 18:35:36 +00:00
parent cd58ef1c8d
commit 479461589b
2 changed files with 5 additions and 3 deletions
@@ -2488,8 +2488,8 @@ class ProductCore extends ObjectModel
 		
 		if ($context == null)
 			$context = Context::getContext()->cloneContext();
-		
-		if ($context->shop->id != (int)$id_shop)
+
+		if ($id_shop !== null && $context->shop->id != (int)$id_shop)
 			$context->shop = new Shop((int)$id_shop);
 		
 		if (!$use_customer_price)
@@ -2533,6 +2533,7 @@ class ProductCore extends ObjectModel
 			}
 			else
 				$sql->select('0 as id_product_attribute');
+
 			$res = Db::getInstance(_PS_USE_SQL_SLAVE_)->executeS($sql);
 			
 			foreach ($res as $row)