projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
205a322
)
DataObjects/Core_enum.php
author
Alan Knowles
<alan@roojs.com>
Tue, 20 Aug 2013 07:53:16 +0000
(15:53 +0800)
committer
Alan Knowles
<alan@roojs.com>
Tue, 20 Aug 2013 07:53:16 +0000
(15:53 +0800)
DataObjects/Core_enum.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
e991c78
..
241a6c6
100644
(file)
--- a/
DataObjects/Core_enum.php
+++ b/
DataObjects/Core_enum.php
@@
-209,6
+209,15
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
foreach($data as $row) {
$t = DB_DAtaObject::Factory('core_enum');
+ $t->etype = isset($row['etype']) ? $row['etype'] : '';
+ $t->etype = isset($base['etype']) ? $base['etype'] : $t->etype ;
+
+ $t->name = isset($row['name']) ? $row['name'] : '';
+ $t->name = isset($base['name']) ? $base['name'] : $t->name;
+
+
+
+
$t->setFrom($row);
$t->setFrom($base);