From 1a5b9de372737e0a70daaa7d9ffbefb9e835d6d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Mon, 26 Aug 2013 17:13:29 +0200
Subject: [PATCH 1/3] // small fix

---
 controllers/front/CartController.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index 4f2ab4275..e6c71f4a2 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -69,13 +69,13 @@ class CartControllerCore extends FrontController
 		{
 			if (Tools::getIsset('add') || Tools::getIsset('update'))
 				$this->processChangeProductInCart();
-			else if (Tools::getIsset('delete'))
+			elseif (Tools::getIsset('delete'))
 				$this->processDeleteProductInCart();
-			else if (Tools::getIsset('changeAddressDelivery'))
+			elseif (Tools::getIsset('changeAddressDelivery'))
 				$this->processChangeProductAddressDelivery();
-			else if (Tools::getIsset('allowSeperatedPackage'))
+			elseif (Tools::getIsset('allowSeperatedPackage'))
 				$this->processAllowSeperatedPackage();
-			else if (Tools::getIsset('duplicate'))
+			elseif (Tools::getIsset('duplicate'))
 				$this->processDuplicateProduct();
 			// Make redirection
 			if (!$this->errors && !$this->ajax)
@@ -181,7 +181,7 @@ class CartControllerCore extends FrontController
 
 		if ($this->qty == 0)
 			$this->errors[] = Tools::displayError('Null quantity.');
-		else if (!$this->id_product)
+		elseif (!$this->id_product)
 			$this->errors[] = Tools::displayError('Product not found');
 
 		$product = new Product($this->id_product, true, $this->context->language->id);
@@ -197,7 +197,7 @@ class CartControllerCore extends FrontController
 		if (is_array($cart_products))
 			foreach ($cart_products as $cart_product)
 			{
-				if ((isset($this->id_product_attribute) && $cart_product['id_product_attribute'] == $this->id_product_attribute) ||
+				if ((isset($this->id_product_attribute) && $cart_product['id_product_attribute'] == $this->id_product_attribute && $this->id_product_attribute) ||
 					(isset($this->id_product) && $cart_product['id_product'] == $this->id_product))
 				{
 					$qty_to_check = $cart_product['cart_quantity'];
@@ -217,17 +217,17 @@ class CartControllerCore extends FrontController
 			if (!Product::isAvailableWhenOutOfStock($product->out_of_stock) && !Attribute::checkAttributeQty($this->id_product_attribute, $qty_to_check))
 				$this->errors[] = Tools::displayError('There isn\'t enough product in stock.');
 		}
-		else if ($product->hasAttributes())
+		elseif ($product->hasAttributes())
 		{
 			$minimumQuantity = ($product->out_of_stock == 2) ? !Configuration::get('PS_ORDER_OUT_OF_STOCK') : !$product->out_of_stock;
 			$this->id_product_attribute = Product::getDefaultAttribute($product->id, $minimumQuantity);
 			// @todo do something better than a redirect admin !!
 			if (!$this->id_product_attribute)
 				Tools::redirectAdmin($this->context->link->getProductLink($product));
-			else if (!Product::isAvailableWhenOutOfStock($product->out_of_stock) && !Attribute::checkAttributeQty($this->id_product_attribute, $qty_to_check))
+			elseif (!Product::isAvailableWhenOutOfStock($product->out_of_stock) && !Attribute::checkAttributeQty($this->id_product_attribute, $qty_to_check))
 				$this->errors[] = Tools::displayError('There isn\'t enough product in stock.');
 		}
-		else if (!$product->checkQty($qty_to_check))
+		elseif (!$product->checkQty($qty_to_check))
 			$this->errors[] = Tools::displayError('There isn\'t enough product in stock.');
 
 		// If no errors, process product addition

From 6fd7f0114ea3b2bea08ba2a63f2eb5ff3fba1c9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Mon, 26 Aug 2013 17:17:26 +0200
Subject: [PATCH 2/3] // small fix

---
 controllers/front/CartController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/controllers/front/CartController.php b/controllers/front/CartController.php
index e6c71f4a2..d9572f5ed 100644
--- a/controllers/front/CartController.php
+++ b/controllers/front/CartController.php
@@ -197,7 +197,7 @@ class CartControllerCore extends FrontController
 		if (is_array($cart_products))
 			foreach ($cart_products as $cart_product)
 			{
-				if ((isset($this->id_product_attribute) && $cart_product['id_product_attribute'] == $this->id_product_attribute && $this->id_product_attribute) ||
+				if ((!isset($this->id_product_attribute) || $cart_product['id_product_attribute'] == $this->id_product_attribute) &&
 					(isset($this->id_product) && $cart_product['id_product'] == $this->id_product))
 				{
 					$qty_to_check = $cart_product['cart_quantity'];

From 2620242176330ae368054bc2104b0a7240d7b061 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Mon, 26 Aug 2013 18:31:45 +0200
Subject: [PATCH 3/3] // Fix cms_block creation loop on shop addition

---
 modules/blockcms/blockcms.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/blockcms/blockcms.php b/modules/blockcms/blockcms.php
index 2075ddc5b..2b808b6f6 100755
--- a/modules/blockcms/blockcms.php
+++ b/modules/blockcms/blockcms.php
@@ -757,7 +757,7 @@ class BlockCms extends Module
 		//get all cmd block to duplicate in new shop
 		$cms_blocks = Db::getInstance()->executeS('
 			SELECT * FROM `'._DB_PREFIX_.'cms_block` cb 
-			LEFT JOIN `'._DB_PREFIX_.'cms_block_shop` cbf 
+			JOIN `'._DB_PREFIX_.'cms_block_shop` cbf 
 				ON (cb.`id_cms_block` = cbf.`id_cms_block` AND cbf.`id_shop` = '.(int)$params['old_id_shop'].') ');
 
 		if (count($cms_blocks))