From 026c198e97cb9ab08ac809d1714a515604f563e9 Mon Sep 17 00:00:00 2001
From: rGaillard <remi.gaillard@prestashop.com>
Date: Wed, 17 Oct 2012 08:58:20 +0000
Subject: [PATCH] [-] FO: Fix #PSCFV-5025

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17888 b9a71923-0436-4b27-9f14-aed3839534dd
---
 classes/Link.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/classes/Link.php b/classes/Link.php
index 8e03d8262..039a552b8 100644
--- a/classes/Link.php
+++ b/classes/Link.php
@@ -321,7 +321,10 @@ class LinkCore
 
 		// If the module has its own route ... just use it !
 		if (Dispatcher::getInstance()->hasRoute('module-'.$module.'-'.$controller, $id_lang))
+		{
+			unset($params['module']);
 			return $this->getPageLink('module-'.$module.'-'.$controller, $ssl, $id_lang, $params);
+		}
 		else
 			return $url.Dispatcher::getInstance()->createUrl('module', $id_lang, $params, $this->allow);
 	}
@@ -409,7 +412,7 @@ class LinkCore
 				$request = urlencode($request);
 			parse_str($request, $request);
 		}
-		unset($request['controller'], $request['module']);
+		unset($request['controller']);
 
 		$uri_path = Dispatcher::getInstance()->createUrl($controller, $id_lang, $request);
 		$url = ($ssl && $this->ssl_enable) ? Tools::getShopDomainSsl(true) : Tools::getShopDomain(true);