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

index f4de617..ee16e33 100644 (file)
@@ -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);