DataObjects/Core_enum.php

[Pman.Core] / I18n.php

diff --git a/I18n.php b/I18n.php
index ffd6b4c..81d40c2 100644 (file)
--- a/I18n.php
+++ b/I18n.php
@@ -263,22 +263,26 @@ class Pman_Core_I18n extends Pman
     function convertCurrency($val, $from, $to)
     {
         
-        DB_DAtaObject::Factory('core_curr_rate')->convert($val,$from,$to);
+        return DB_DAtaObject::Factory('core_curr_rate')->convert($val,$from,$to);
     
     }
     /**
      * DO NOT USE THIS -- see core_curr_rates dataobject.
      *
      */
-    var $rates = array();
+    
+    
+    
     function loadRates()
-    {
-        if (!empty($this->rates)) {
-            return true;
-        }
+    {   
+        static $rates = array();
         
-        $this->rates = DB_DAtaObject::Factory('core_curr_rate')->currentRates();
+        if (!empty($rates)) {
+            $this->rates = $rates;
+            return;
+        }
         
+        $this->rates = $rates = DB_DAtaObject::Factory('core_curr_rate')->currentRates();
         
     }