dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] BO : #PSCFV-2279 Removed alert if token is invalid.

Browse Source 
// Trimmed trailing spaces
This commit is contained in:
jObregon
2012-05-10 18:44:10 +00:00
parent 7132247cb2
commit 49bd4ee516
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controllers/admin/AdminPerformanceController.php
+2 -2
View File
@@ -504,9 +504,9 @@ class AdminPerformanceControllerCore extends AdminController
public function initContent()
{
$php_dot_net_supported_langs = array('en', 'zh', 'fr', 'de', 'ja', 'pl', 'ro', 'ru', 'fa', 'es', 'tr');
$php_lang = in_array($this->context->language->iso_code, $php_dot_net_supported_langs) ?
$php_lang = in_array($this->context->language->iso_code, $php_dot_net_supported_langs) ?
$this->context->language->iso_code : 'en';
if (!extension_loaded('memcache'))
$this->warnings[] = $this->l('To use Memcached, you must install the Memcache PECL extension on your server.').'
<a href="http://www.php.net/manual/'.substr($php_lang, 0, 2).'/memcache.installation.php" target="_blank">
controllers/front/CartController.php
+1 -4
View File
@@ -62,11 +62,8 @@ class CartControllerCore extends FrontController
public function postProcess()
{
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
if ($this->context->cookie->exists() && !$this->errors)
if ($this->context->cookie->exists() && !$this->errors && !($this->context->customer->isLogged() && !$this->isTokenValid()))
{
if (Tools::getIsset('add') || Tools::getIsset('update'))
$this->processChangeProductInCart();