X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_curr_rate.php;h=5b6858cfbf1fb3bae92d5174f982871de11bac61;hp=f4a86de042dce121dd99fa89199a431d5ac59552;hb=HEAD;hpb=65df711ffc2803ba374d2ecc1e0b5fba541c1a9c

diff --git a/DataObjects/Core_curr_rate.php b/DataObjects/Core_curr_rate.php
index f4a86de0..5b6858cf 100644
--- a/DataObjects/Core_curr_rate.php
+++ b/DataObjects/Core_curr_rate.php
@@ -2,7 +2,7 @@
 /**
  * Table Definition for core_curr_rate
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject 
 {
@@ -113,7 +113,7 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
                 if ($ov->rate == $rate) {
                     // modify the old one to expire
                     $oo = clone($ov);
-                    $ov->to_dt = $nv->from_dt;
+                    $ov->to_dt = $nl->from_dt;
                     $ov->update($oo);
                     continue;
                 }
@@ -157,10 +157,10 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
         
         // crappy error handling..
         if ($fr === false) {
-            $fr = 1;
+            return false;
         }
         if ($tr === false) {
-            $tr = 1;
+            return false;
         }
         
         return ((1.0 / $fr) * $val) * $tr;
@@ -172,12 +172,15 @@ class Pman_Core_DataObjects_Core_curr_rate extends DB_DataObject
     function currentRates()
     {
         $this->loadRates();
+       // DB_DataObject::debugLevel(1);
         $c = DB_DAtaObject::factory('core_curr_rate');
         $c->whereAdd('from_dt < NOW() AND to_dt > NOW()');
+        $c->find();
+        $ret = array();
         while($c->fetch()) {
             $ret[$c->curr] = $c->rate;
         }
-        
+        return $ret;