// Merge -> revision 7941

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7948 b9a71923-0436-4b27-9f14-aed3839534dd
2011-08-08 16:01:47 +00:00
parent 58769824ce
commit 47a4f7f31e
16 changed files with 200 additions and 65 deletions
@@ -39,6 +39,8 @@ class SupplierControllerCore extends FrontController
 	
 	public function canonicalRedirection()
 	{
+		if (Configuration::get('PS_CANONICAL_REDIRECT'))
+		{
 		if (Validate::isLoadedObject($this->supplier))
 		{
 			$canonicalURL = self::$link->getSupplierLink($this->supplier);
@@ -51,6 +53,7 @@ class SupplierControllerCore extends FrontController
 			}
 		}
 	}
+	}
 	
 	public function preProcess()
 	{