diff --git a/install-dev/upgrade/sql/1.5.0.13.sql b/install-dev/upgrade/sql/1.5.0.13.sql index 11cedb5de..69c431ffd 100644 --- a/install-dev/upgrade/sql/1.5.0.13.sql +++ b/install-dev/upgrade/sql/1.5.0.13.sql @@ -1,4 +1,3 @@ SET NAMES 'utf8'; /* PHP:add_missing_image_key(); */; -ALTER TABLE `PREFIX_cms_block_shop` ADD COLUMN `id_group_shop` int(10) unsigned DEFAULT 0 AFTER `id_cms_block`; \ No newline at end of file diff --git a/modules/blockcms/BlockCMSModel.php b/modules/blockcms/BlockCMSModel.php index cafeaa7cf..73771715a 100644 --- a/modules/blockcms/BlockCMSModel.php +++ b/modules/blockcms/BlockCMSModel.php @@ -119,7 +119,6 @@ class BlockCMSModel extends ObjectModel { $sql = 'CREATE TABLE IF NOT EXISTS `'._DB_PREFIX_.'cms_block_shop` ( `id_cms_block` int(10) unsigned NOT NULL auto_increment, - `id_group_shop` int(10) unsigned NOT NULL, `id_shop` int(10) unsigned NOT NULL, PRIMARY KEY (`id_cms_block`, `id_shop`) ) ENGINE='._MYSQL_ENGINE_.' DEFAULT CHARSET=utf8'; @@ -158,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); diff --git a/modules/blockcms/blockcms.php b/modules/blockcms/blockcms.php index 0ddd6be84..15fb2acc4 100755 --- a/modules/blockcms/blockcms.php +++ b/modules/blockcms/blockcms.php @@ -559,7 +559,10 @@ class BlockCms extends Module foreach ($this->context->controller->_languages as $language) BlockCMSModel::insertCMSBlockLang($id_cms_block, $language['id_lang']); - BlockCMSModel::insertCMSBlockShop($id_cms_block, $this->context->shop->id_shop_group, $this->context->shop->id); + $shops = Shop::getContextListShopID(); + + foreach ($shops as $shop) + BlockCMSModel::insertCMSBlockShop($id_cms_block, $shop); } $this->_errors[] = $this->l('New block cannot be created !');