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

Merge branch 'development' of https://github.com/PrestaShop/PrestaShop into development

Browse Source
This commit is contained in:
gRoussac
2013-11-12 12:32:37 +01:00
parent f0f630fb50 8be339463d
commit 40abef8aac
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Currency.php
+1 -1
View File
@@ -296,7 +296,7 @@ class CurrencyCore extends ObjectModel
*/ */
public static function getIdByIsoCode($iso_code, $id_shop = 0) public static function getIdByIsoCode($iso_code, $id_shop = 0)
{ {
$cache_id = 'Currency::getIdByIsoCode'.pSQL($iso_code).'-'.(int)$id_shop; $cache_id = 'Currency::getIdByIsoCode_'.pSQL($iso_code).'-'.(int)$id_shop;
if (!Cache::isStored($cache_id)) if (!Cache::isStored($cache_id))
{ {
$query = Currency::getIdByQuery($id_shop); $query = Currency::getIdByQuery($id_shop);
classes/LocalizationPack.php
+1
View File
@@ -63,6 +63,7 @@ class LocalizationPackCore
if ($install_mode && $res && isset($this->iso_currency)) if ($install_mode && $res && isset($this->iso_currency))
{ {
Cache::clean('Currency::getIdByIsoCode_*');
$res &= Configuration::updateValue('PS_CURRENCY_DEFAULT', (int)Currency::getIdByIsoCode($this->iso_currency)); $res &= Configuration::updateValue('PS_CURRENCY_DEFAULT', (int)Currency::getIdByIsoCode($this->iso_currency));
Currency::refreshCurrencies(); Currency::refreshCurrencies();
} }