From 1ae587475b5b58c80744ece54554e576193d2f6d Mon Sep 17 00:00:00 2001
From: gRoussac <gregory.roussac@prestashop.com>
Date: Tue, 22 Oct 2013 12:19:58 +0200
Subject: [PATCH] [-] MO : Fix bug #PSCFV-10787, cms associated to all shops

---
 modules/blockcms/BlockCMSModel.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/modules/blockcms/BlockCMSModel.php b/modules/blockcms/BlockCMSModel.php
index d0c63ee10..88c2a969f 100644
--- a/modules/blockcms/BlockCMSModel.php
+++ b/modules/blockcms/BlockCMSModel.php
@@ -364,15 +364,20 @@ class BlockCMSModel extends ObjectModel
 		return Db::getInstance()->executeS($sql);
 	}
 
-	public static function getCMSBlockPages($id_block)
+	public static function getCMSBlockPages($id_block, $id_shop = false)
 	{
+        $id_shop = ($id_shop !== false) ? $id_shop : Context::getContext()->shop->id;
+
 		$sql = 'SELECT cl.`id_cms`, cl.`meta_title`, cl.`link_rewrite`
 			FROM `'._DB_PREFIX_.'cms_block_page` bcp
 			INNER JOIN `'._DB_PREFIX_.'cms_lang` cl
 			ON (bcp.`id_cms` = cl.`id_cms`)
 			INNER JOIN `'._DB_PREFIX_.'cms` c
 			ON (bcp.`id_cms` = c.`id_cms`)
+			INNER JOIN `'._DB_PREFIX_.'cms_shop` cs
+			ON (c.`id_cms` = cs.`id_cms`)
 			WHERE bcp.`id_cms_block` = '.(int)$id_block.'
+			AND cs.`id_shop` = '.(int)$id_shop.'
 			AND cl.`id_lang` = '.(int)Context::getContext()->language->id.'
 			AND bcp.`is_category` = 0
 			AND c.`active` = 1
@@ -534,8 +539,7 @@ class BlockCMSModel extends ObjectModel
 			{
 				$key = (int)$cmsCategory['id_cms_block'];
 				$content[$key]['display_store'] = $cmsCategory['display_store'];
-				$content[$key]['cms'] = BlockCMSModel::getCMSBlockPages($cmsCategory['id_cms_block']);
-
+				$content[$key]['cms'] = BlockCMSModel::getCMSBlockPages($cmsCategory['id_cms_block'], $id_shop);
 				$links = array();
 				if (count($content[$key]['cms']))
 				{