Fix admin currency display

gburton · Nov 14, 2020 · 542dc0f · 542dc0f
1 parent e16b18b
commit 542dc0f
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/includes/system/versioned/1.0.7.9/currencies.php b/includes/system/versioned/1.0.7.9/currencies.php
@@ -35,13 +35,13 @@ public function __construct() {
     }
 
 // class methods
-    public function format($number, $calculate_currency_value = true, $currency_type = '', $currency_value = '') {
+    public function format($number, $calculate_currency_value = true, $currency_type = null, $currency_value = null) {
       if (empty($currency_type)) {
-        $currency_type = $_SESSION['currency'];
+        $currency_type = $_SESSION['currency'] ?? DEFAULT_CURRENCY;
       }
 
       if ($calculate_currency_value) {
-        $number *= tep_not_null($currency_value) ? $currency_value : $this->currencies[$currency_type]['value'];
+        $number *= ($currency_value ?? $this->currencies[$currency_type]['value']);
       }
 
       return $this->currencies[$currency_type]['symbol_left']
@@ -73,13 +73,13 @@ public function display_price($products_price, $products_tax, $quantity = 1) {
       return $this->format($this->calculate_price($products_price, $products_tax, $quantity));
     }
 
-    public function format_raw($number, $calculate_currency_value = true, $currency_type = '', $currency_value = '') {
+    public function format_raw($number, $calculate_currency_value = true, $currency_type = null, $currency_value = null) {
       if (empty($currency_type)) {
-        $currency_type = $_SESSION['currency'];
+        $currency_type = $_SESSION['currency'] ?? DEFAULT_CURRENCY;
       }
 
       if ($calculate_currency_value) {
-        $number *= tep_not_null($currency_value) ? $currency_value : $this->currencies[$currency_type]['value'];
+        $number *= ($currency_value ?? $this->currencies[$currency_type]['value']);
       }
 
       return number_format(tep_round($number, $this->currencies[$currency_type]['decimal_places']), $this->currencies[$currency_type]['decimal_places'], '.', '');