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

// FO : more optimizations with unnecessary instantiations

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@14160 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
tDidierjean
2012-03-14 14:51:49 +00:00
parent 014193f2c2
commit 0e7c1835e0
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+8 -5
View File
@@ -376,12 +376,15 @@ class ToolsCore
{
if (!$context)
$context = Context::getContext();
if (($id_lang = (int)Tools::getValue('id_lang')) && Validate::isUnsignedId($id_lang))
$context->cookie->id_lang = $id_lang;
$language = new Language($id_lang);
if (Validate::isLoadedObject($language))
$context->language = $language;
// update language only if new id is different from old id
if (($id_lang = (int)Tools::getValue('id_lang')) && Validate::isUnsignedId($id_lang) && $context->cookie->id_lang != (int)$id_lang)
{
$context->cookie->id_lang = $id_lang;
$language = new Language($id_lang);
if (Validate::isLoadedObject($language))
$context->language = $language;
}
}
/**
modules/blockcart/blockcart.php
+3 -5
View File
@@ -49,12 +49,10 @@ class BlockCart extends Module
global $errors;
// Set currency
if (!(int)($params['cart']->id_currency))
$currency = new Currency((int)$params['cookie']->id_currency);
else
if ((int)$params['cart']->id_currency && (int)$params['cart']->id_currency != $this->context->currency->id)
$currency = new Currency((int)$params['cart']->id_currency);
if (!Validate::isLoadedObject($currency))
$currency = new Currency((int)(Configuration::get('PS_CURRENCY_DEFAULT')));
else
$currency = $this->context->currency;
if ($params['cart']->id_customer)
{