projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ed87490
)
DataObjects/Core_enum.php
author
Alan Knowles
<alan@roojs.com>
Mon, 17 Dec 2012 02:44:21 +0000
(10:44 +0800)
committer
Alan Knowles
<alan@roojs.com>
Mon, 17 Dec 2012 02:44:21 +0000
(10:44 +0800)
DataObjects/Core_enum.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
f4de617
..
ee16e33
100644
(file)
--- 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);