DataObjects/Core_enum.php
authorAlan Knowles <alan@roojs.com>
Mon, 17 Dec 2012 02:45:48 +0000 (10:45 +0800)
committerAlan Knowles <alan@roojs.com>
Mon, 17 Dec 2012 02:45:48 +0000 (10:45 +0800)
DataObjects/Core_enum.php

index c2fa5bf..911af8c 100644 (file)
@@ -152,8 +152,9 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         }
         foreach($data as $row) {
             $t = DB_DAtaObject::Factory('core_enum');
-            print_r(array_merge($base, $row ));
-            $t->setFrom(array_merge($base, $row ));
+            
+            $t->setFrom($row);
+            $t->setFrom($base);
             
             echo '<PRE>';print_r($t);