Merge branch 'release' of https://github.com/PrestaShop/PrestaShop into release

2013-03-13 18:21:40 +01:00
parent 58d08ce1b0 09f70a0020
commit ec757d90c7
1 changed files with 1 additions and 1 deletions
@@ -1701,7 +1701,7 @@ class CartCore extends ObjectModel
 			if (!$this->allow_seperated_package)
 				$key = 'in_stock';
 			else
-				$key = (!$product['out_of_stock']) ? 'in_stock' : 'out_of_stock';
+				$key = $product['in_stock'] ? 'in_stock' : 'out_of_stock';

 			if (empty($product['carrier_list']))
 				$product['carrier_list'] = array(0);