// Fixed Division by ZERO ...

git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@15899 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
bMancone committed 2012-06-07 08:29:21 +00:00
1 parent 1989633b54
commit a473ef5fbc
1 file changed
+2 -1
+2 -1
View File
@@ -550,8 +550,9 @@ class ToolsCore
$amount *= $currency_to->conversion_rate; $amount *= $currency_to->conversion_rate;
else else
{ {
$conversion_rate = ($currency_from->conversion_rate == 0 ? 1 : $currency_from->conversion_rate);
// Convert amount to default currency (using the old currency rate) // Convert amount to default currency (using the old currency rate)
$amount = Tools::ps_round($amount / $currency_from->conversion_rate, 2); $amount = Tools::ps_round($amount / $conversion_rate, 2);
// Convert to new currency // Convert to new currency
$amount *= $currency_to->conversion_rate; $amount *= $currency_to->conversion_rate;
} }