// MERGE with 1.4 r7770

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@7776 b9a71923-0436-4b27-9f14-aed3839534dd

controllers/CartController.php

@@ -27,6 +27,11 @@
 
 class CartControllerCore extends FrontController
 {
+	public $php_self = 'cart.php';
+	
+	// This is not a public page, so the canonical redirection is disabled
+	public function canonicalRedirection(){}
+	
 	public function run()
 	{
 		$this->init();
@@ -85,7 +90,7 @@ class CartControllerCore extends FrontController
 		if (Configuration::get('PS_TOKEN_ENABLE') == 1 &&
 			strcasecmp(Tools::getToken(false), strval(Tools::getValue('token'))) &&
 			$this->context->customer->isLogged() === true)
-			$this->errors[] = Tools::displayError('Invalid token');
+				$this->errors[] = Tools::displayError('Invalid token');
 
 		// Update the cart ONLY if $this->cookies are available, in order to avoid ghost carts created by bots
 		if (($add OR Tools::getIsset('update') OR $delete) AND isset($_COOKIE[$this->context->cookie->getName()]))