[-] FO: Fix #PSCFV-5025
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@17888 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
1 parent
400f41df39
commit
026c198e97
1 file changed
+4
-1
+4
-1
@@ -321,7 +321,10 @@ class LinkCore
|
|||||||
|
|
||||||
// If the module has its own route ... just use it !
|
// If the module has its own route ... just use it !
|
||||||
if (Dispatcher::getInstance()->hasRoute('module-'.$module.'-'.$controller, $id_lang))
|
if (Dispatcher::getInstance()->hasRoute('module-'.$module.'-'.$controller, $id_lang))
|
||||||
|
{
|
||||||
|
unset($params['module']);
|
||||||
return $this->getPageLink('module-'.$module.'-'.$controller, $ssl, $id_lang, $params);
|
return $this->getPageLink('module-'.$module.'-'.$controller, $ssl, $id_lang, $params);
|
||||||
|
}
|
||||||
else
|
else
|
||||||
return $url.Dispatcher::getInstance()->createUrl('module', $id_lang, $params, $this->allow);
|
return $url.Dispatcher::getInstance()->createUrl('module', $id_lang, $params, $this->allow);
|
||||||
}
|
}
|
||||||
@@ -409,7 +412,7 @@ class LinkCore
|
|||||||
$request = urlencode($request);
|
$request = urlencode($request);
|
||||||
parse_str($request, $request);
|
parse_str($request, $request);
|
||||||
}
|
}
|
||||||
unset($request['controller'], $request['module']);
|
unset($request['controller']);
|
||||||
|
|
||||||
$uri_path = Dispatcher::getInstance()->createUrl($controller, $id_lang, $request);
|
$uri_path = Dispatcher::getInstance()->createUrl($controller, $id_lang, $request);
|
||||||
$url = ($ssl && $this->ssl_enable) ? Tools::getShopDomainSsl(true) : Tools::getShopDomain(true);
|
$url = ($ssl && $this->ssl_enable) ? Tools::getShopDomainSsl(true) : Tools::getShopDomain(true);
|
||||||
|
|||||||
Reference in new issue
Block a user