diff --git a/classes/Currency.php b/classes/Currency.php index a9c92fc43..befc25fd1 100644 --- a/classes/Currency.php +++ b/classes/Currency.php @@ -388,10 +388,10 @@ class CurrencyCore extends ObjectModel if (!$default_currency = Currency::getDefaultCurrency()) return Tools::displayError('No default currency'); - $currencies = Currency::getCurrencies(true); + $currencies = Currency::getCurrencies(true, false); foreach ($currencies as $currency) - $currency->refreshCurrency($feed->list, $isoCodeSource, $default_currency); - + if ($currency->id != $default_currency->id) + $currency->refreshCurrency($feed->list, $isoCodeSource, $default_currency); } /** diff --git a/controllers/admin/AdminCurrenciesController.php b/controllers/admin/AdminCurrenciesController.php index 49962dd42..5ffdc0a5b 100644 --- a/controllers/admin/AdminCurrenciesController.php +++ b/controllers/admin/AdminCurrenciesController.php @@ -291,7 +291,7 @@ class AdminCurrenciesControllerCore extends AdminController */ public function initProcess() { - if (Tools::isSubmit('submitExchangesRates')) + if (Tools::isSubmit('SubmitExchangesRates')) { if ($this->tabAccess['edit'] === '1') $this->action = 'exchangeRates';