From d40d841cf3bdbdc24ef7cc3975e75cb6daad2692 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Gaillard?= <remi.gaillard@prestashop.com>
Date: Wed, 14 Aug 2013 15:15:41 +0200
Subject: [PATCH] // something is missing in
 3d591be8c67dd0cdd21ce4927306664cee862f12

---
 classes/Link.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/classes/Link.php b/classes/Link.php
index 0f89919bd..b45b9beae 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -634,7 +634,7 @@ class LinkCore
 		if (!$context)
 			$context = Context::getContext();
 
-		if (!$this->allow || !Language::isMultiLanguageActivated($id_shop))
+		if ((!$this->allow && in_array($id_shop, array($context->id_shop,  null))) || !Language::isMultiLanguageActivated($id_shop) || !(int)Configuration::get('PS_REWRITING_SETTINGS', null, null, $id_shop))
 			return '';
 
 		if (!$id_lang)