From 85f3df042faa8c3d915be2d30e377b7aecd572d0 Mon Sep 17 00:00:00 2001 From: bMancone Date: Mon, 20 Feb 2012 09:22:15 +0000 Subject: [PATCH] // Fixed missing parameters when calling Currency::exists --- classes/Currency.php | 2 +- classes/LocalizationPack.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/Currency.php b/classes/Currency.php index d879a9b65..5b227105a 100644 --- a/classes/Currency.php +++ b/classes/Currency.php @@ -115,7 +115,7 @@ class CurrencyCore extends ObjectModel */ public function add($autodate = true, $nullValues = false) { - return Currency::exists($this->iso_code) ? false : parent::add(); + return Currency::exists($this->iso_code, $this->iso_code_num) ? false : parent::add(); } /** diff --git a/classes/LocalizationPack.php b/classes/LocalizationPack.php index 220043cbd..5104e2afb 100644 --- a/classes/LocalizationPack.php +++ b/classes/LocalizationPack.php @@ -243,7 +243,7 @@ class LocalizationPackCore foreach ($xml->currencies->currency as $data) { $attributes = $data->attributes(); - if (Currency::exists($attributes['iso_code'])) + if (Currency::exists($attributes['iso_code'], (int)$attributes['iso_code_num'])) continue; $currency = new Currency(); $currency->name = (string)$attributes['name']; @@ -260,7 +260,7 @@ class LocalizationPackCore $this->_errors[] = Tools::displayError('Invalid currency properties.'); return false; } - if (!Currency::exists($currency->iso_code)) + if (!Currency::exists($currency->iso_code, $currency->iso_code_num)) { if (!$currency->add()) {