// Updated isTokenValid(). Thanks Olea.

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

classes/controller/FrontController.php

@@ -881,7 +881,10 @@ class FrontControllerCore extends Controller
 	 */
 	public function isTokenValid()
 	{
-		return Configuration::get('PS_TOKEN_ENABLE') && strcasecmp(Tools::getToken(false), Tools::getValue('token')) && $this->context->customer->isLogged();
+		if (!Configuration::get('PS_TOKEN_ENABLE'))
+			return true;
+
+		return strcasecmp(Tools::getToken(false), Tools::getValue('token'));
 	}
 
 	/**

controllers/front/AddressController.php

@@ -122,7 +122,7 @@ class AddressControllerCore extends FrontController
 		$address->id_customer = (int)$this->context->customer->id;
 
 		// Check page token
-		if ($this->isTokenValid())
+		if ($this->context->customer->isLogged() && !$this->isTokenValid())
 			$this->errors[] = Tools::displayError('Invalid token');
 
 		// Check phone

controllers/front/CartController.php

@@ -62,7 +62,7 @@ class CartControllerCore extends FrontController
 
 	public function postProcess()
 	{
-		if ($this->isTokenValid())
+		if ($this->context->customer->isLogged() && !$this->isTokenValid())
 			$this->errors[] = Tools::displayError('Invalid token');
 
 		// Update the cart ONLY if $this->cookies are available, in order to avoid ghost carts created by bots