From 145bf259aae5bc7d343965d77eaf1ca8540f5664 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 17 Dec 2012 10:45:48 +0800
Subject: [PATCH] DataObjects/Core_enum.php

---
 DataObjects/Core_enum.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index c2fa5bfc..911af8c6 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -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);
             
-- 
2.39.2