From 1f3c2debff9d4d8502acdb4d514d2f26cf4253f7 Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Mon, 17 Dec 2012 10:44:21 +0800
Subject: [PATCH] DataObjects/Core_enum.php

---
 DataObjects/Core_enum.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index f4de617d..ee16e332 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -151,7 +151,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         }
         foreach($data as $row) {
             $t = DB_DAtaObject::Factory('core_enum');
-            $t->setFrom($row + $base);
+            $t->setFrom(array_merge($row , $base));
             
             echo '<PRE>';print_r($t);
             
-- 
2.39.2