From c5e7c339eb3c455e724df2fab371e03dfbf94003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Gaillard?=
 <francois.gaillard@prestashop.com>
Date: Mon, 27 Feb 2012 08:48:56 +0000
Subject: [PATCH] [-] BO : #PSFV-566 : BugFix - Add new CMS block

---
 modules/blockcms/BlockCMSModel.php | 10 +++++-----
 modules/blockcms/blockcms.php      |  5 +++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/modules/blockcms/BlockCMSModel.php b/modules/blockcms/BlockCMSModel.php
index 071255e1b..049f7a0cb 100644
--- a/modules/blockcms/BlockCMSModel.php
+++ b/modules/blockcms/BlockCMSModel.php
@@ -157,10 +157,10 @@ class BlockCMSModel extends ObjectModel
 		return Db::getInstance()->Insert_ID();
 	}
 
-	public static function insertCMSBlockShop($id_cms_block, $id_group_shop, $id_shop)
+	public static function insertCMSBlockShop($id_cms_block, $id_shop)
 	{
-		$sql = 'INSERT INTO `'._DB_PREFIX_.'cms_block_shop` (`id_cms_block`, `id_group_shop`, `id_shop`)
-				VALUES('.(int)$id_cms_block.', '.(int)$id_group_shop.', '.(int)$id_shop.')';
+		$sql = 'INSERT INTO `'._DB_PREFIX_.'cms_block_shop` (`id_cms_block`, `id_shop`)
+				VALUES('.(int)$id_cms_block.', '.(int)$id_shop.')';
 
 		Db::getInstance()->execute($sql);
 
@@ -521,11 +521,11 @@ class BlockCMSModel extends ObjectModel
 		return $titles;
 	}
 
-	public static function getCMSTitles($location, $id_group_shop = false, $id_shop = false)
+	public static function getCMSTitles($location, $id_shop = false)
 	{
 		$content = array();
 		$context = Context::getContext();
-		$cmsCategories = BlockCMSModel::getCMSCategoriesByLocation($location, $id_group_shop, $id_shop);
+		$cmsCategories = BlockCMSModel::getCMSCategoriesByLocation($location, $id_shop);
 
 		if (is_array($cmsCategories) && count($cmsCategories))
 		{
diff --git a/modules/blockcms/blockcms.php b/modules/blockcms/blockcms.php
index 13147a4b0..489079a68 100755
--- a/modules/blockcms/blockcms.php
+++ b/modules/blockcms/blockcms.php
@@ -178,11 +178,12 @@ class BlockCms extends Module
 					'label' => $this->l('CMS Blocks :'),
 					'name' => 'cms_blocks',
 					'values' => array(
-						0 => BlockCMSModel::getCMSBlocksByLocation(BlockCMSModel::LEFT_COLUMN),
-						1 => BlockCMSModel::getCMSBlocksByLocation(BlockCMSModel::RIGHT_COLUMN))
+						0 => BlockCMSModel::getCMSBlocksByLocation(BlockCMSModel::LEFT_COLUMN, Shop::getContextShopID()),
+						1 => BlockCMSModel::getCMSBlocksByLocation(BlockCMSModel::RIGHT_COLUMN, Shop::getContextShopID()))
 				)
 			)
 		);
+
 		$this->fields_form[1]['form'] = array(
 			'tinymce' => true,
 			'legend' => array(