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

// Fixed Division by ZERO ...

Browse Source
This commit is contained in:
bMancone
2012-06-07 08:29:21 +00:00
parent 08cfd8cd2d
commit 91bcb07911
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Tools.php
+6 -5
View File
@@ -503,7 +503,7 @@ class ToolsCore
public static function convertPrice($price, $currency = null, $to_currency = true, Context $context = null) public static function convertPrice($price, $currency = null, $to_currency = true, Context $context = null)
{ {
static $default_currency = null; static $default_currency = null;
if ($default_currency === null) if ($default_currency === null)
$default_currency = (int)Configuration::get('PS_CURRENCY_DEFAULT'); $default_currency = (int)Configuration::get('PS_CURRENCY_DEFAULT');
@@ -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;
} }
@@ -1145,7 +1146,7 @@ class ToolsCore
public static function ps_round($value, $precision = 0) public static function ps_round($value, $precision = 0)
{ {
static $method = null; static $method = null;
if ($method == null) if ($method == null)
$method = (int)Configuration::get('PS_PRICE_ROUND_MODE'); $method = (int)Configuration::get('PS_PRICE_ROUND_MODE');
@@ -2125,12 +2126,12 @@ FileETag INode MTime Size
{ {
return Tools::apacheModExists('mod_rewrite'); return Tools::apacheModExists('mod_rewrite');
} }
public static function unSerialize($serialized, $object = false) public static function unSerialize($serialized, $object = false)
{ {
if (is_string($serialized) && (strpos($serialized, 'O:') === false || !preg_match('/(^|;|{|})O:[0-9]+:"/', $serialized)) && !$object || $object) if (is_string($serialized) && (strpos($serialized, 'O:') === false || !preg_match('/(^|;|{|})O:[0-9]+:"/', $serialized)) && !$object || $object)
return @unserialize($serialized); return @unserialize($serialized);
return false; return false;
} }
} }