// MERGE product_multistore branch : product fields are now editable per shop

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14682 b9a71923-0436-4b27-9f14-aed3839534dd
2012-04-17 13:32:12 +00:00
parent d4d1c35cb9
commit 0c2dd0cd2f
134 changed files with 3185 additions and 1789 deletions
@@ -559,7 +559,7 @@ class BlockCms extends Module
                    foreach ($this->context->controller->_languages as $language)
                        BlockCMSModel::insertCMSBlockLang($id_cms_block, $language['id_lang']);

-                    BlockCMSModel::insertCMSBlockShop($id_cms_block, Shop::getContextGroupShopID(), Shop::getContextShopID());
+                    BlockCMSModel::insertCMSBlockShop($id_cms_block, Shop::getContextShopGroupID(), Shop::getContextShopID());
                }

                $this->_errors[] = $this->l('New block cannot be created !');