From 45d1224d739dc2f4f7db511fe337f093c007f2a2 Mon Sep 17 00:00:00 2001
From: vAugagneur <vincent.augagneur@prestashop.com>
Date: Fri, 3 Aug 2012 12:47:28 +0000
Subject: [PATCH] [-] FO : fixed bug #PSCFV-3189

---
 classes/Link.php                    |  8 ++++----
 themes/default/nbr-product-page.tpl | 15 +++++++--------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/classes/Link.php b/classes/Link.php
index fdc52948e..fcdb67999 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -469,7 +469,7 @@ class LinkCore
 			if (method_exists($this, $method_name) && isset($_GET['id_'.Dispatcher::getInstance()->getController()]))
 			{
 				$type = Dispatcher::getInstance()->getController();
-				$id_object = $_GET['id_'.Dispatcher::getInstance()->getController()];
+				$id_object = $_GET['id_'.$type];
 			}
 		}
 
@@ -518,11 +518,11 @@ class LinkCore
 			return $url.(($this->allow == 1 || $url == $this->url) ? '?' : '&').http_build_query($vars, '', '&');
 		$vars['requestUrl'] = $url;
 
-		if (!$this->allow == 1)
-			$vars['controller'] = Dispatcher::getInstance()->getController();
-
 		if ($type && $id_object)
 			$vars['id_'.$type] = (is_object($id_object) ? (int)$id_object->id : (int)$id_object);
+			
+		if (!$this->allow == 1)
+			$vars['controller'] = Dispatcher::getInstance()->getController();
 		return $vars;
 	}
 
diff --git a/themes/default/nbr-product-page.tpl b/themes/default/nbr-product-page.tpl
index 4395dd0c2..c54c88c0c 100644
--- a/themes/default/nbr-product-page.tpl
+++ b/themes/default/nbr-product-page.tpl
@@ -45,6 +45,13 @@
 				{if isset($search_query) AND $search_query}<input type="hidden" name="search_query" value="{$search_query|escape:'htmlall':'UTF-8'}" />{/if}
 				{if isset($tag) AND $tag AND !is_array($tag)}<input type="hidden" name="tag" value="{$tag|escape:'htmlall':'UTF-8'}" />{/if}
 				<label for="nb_item">{l s='Show:'}</label>
+				{if is_array($requestNb)}
+					{foreach from=$requestNb item=requestValue key=requestKey}
+						{if $requestKey != 'requestUrl'}
+							<input type="hidden" name="{$requestKey|escape:'htmlall':'UTF-8'}" value="{$requestValue|escape:'htmlall':'UTF-8'}" />
+						{/if}
+					{/foreach}
+				{/if}
 				<select name="n" id="nb_item" onchange="document.getElementById('nbrItemPage').submit();">
 				{assign var="lastnValue" value="0"}
 				{foreach from=$nArray item=nValue}
@@ -55,14 +62,6 @@
 				{/foreach}
 				</select>
 				<span>{l s='products by page'}</span>
-				<input type="hidden" name="controller" value="{$page_name}" />
-				{if is_array($requestNb)}
-					{foreach from=$requestNb item=requestValue key=requestKey}
-						{if $requestKey != 'requestUrl'}
-							<input type="hidden" name="{$requestKey|escape:'htmlall':'UTF-8'}" value="{$requestValue|escape:'htmlall':'UTF-8'}" />
-						{/if}
-					{/foreach}
-				{/if}
 			</p>
 		</form>
 	{/if}