From e80498c87790aedadb8124b6d2d1ab2a375ec530 Mon Sep 17 00:00:00 2001
From: tDidierjean <thomas.didierjean@prestashop.com>
Date: Wed, 9 May 2012 14:10:33 +0000
Subject: [PATCH] [-] BO : fix bug #PSCFV-2231 - blocklink problem when not in
 multishop

---
 modules/blocklink/blocklink.php | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/modules/blocklink/blocklink.php b/modules/blocklink/blocklink.php
index dc95d8396..a216be83c 100644
--- a/modules/blocklink/blocklink.php
+++ b/modules/blocklink/blocklink.php
@@ -183,14 +183,27 @@ class BlockLink extends Module
 						return false;
 		}
 
-		$assos_shop = Tools::getValue('checkBoxShopAsso_blocklink');
 		Db::getInstance()->execute('DELETE FROM '._DB_PREFIX_.'blocklink_shop WHERE id_blocklink='.(int)$id_link);
-		foreach ($assos_shop as $asso)
-			foreach ($asso as $id_shop => $row)
-				Db::getInstance()->insert('blocklink_shop', array(
-					'id_blocklink' =>	(int)$id_link,
-					'id_shop' => (int)$id_shop,
-				));
+
+		if (!Shop::isFeatureActive())
+		{
+			Db::getInstance()->insert('blocklink_shop', array(
+				'id_blocklink' => (int)$id_link,
+				'id_shop' => (int)Context::getContext()->shop->id,
+			));
+		}
+		else
+		{
+			$assos_shop = Tools::getValue('checkBoxShopAsso_blocklink');
+			if (empty($assos_shop))
+				return false;
+			foreach ($assos_shop as $asso)
+				foreach ($asso as $id_shop => $row)
+					Db::getInstance()->insert('blocklink_shop', array(
+						'id_blocklink' => (int)$id_link,
+						'id_shop' => (int)$id_shop,
+					));
+		}
 		return true;
 	}