// Merg// Merge -> revision 8395

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@8397 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
rMalie
2011-09-07 16:23:13 +00:00
parent 5aab81dc66
commit 24e213cda8
27 changed files with 2801 additions and 617 deletions
+1 -1
View File
@@ -51,7 +51,7 @@ class CategoryControllerCore extends FrontController
public function canonicalRedirection()
{
if (Configuration::get('PS_CANONICAL_REDIRECT'))
if (Configuration::get('PS_CANONICAL_REDIRECT') && !Tools::getValue('noredirect'))
{
// Automatically redirect to the canonical URL if the current in is the right one
// $_SERVER['HTTP_HOST'] must be replaced by the real canonical domain