projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
583137d
)
DataObjects/Core_enum.php
author
edward
<edward@roojs.com>
Mon, 1 Aug 2016 05:27:56 +0000
(13:27 +0800)
committer
edward
<edward@roojs.com>
Mon, 1 Aug 2016 05:27:56 +0000
(13:27 +0800)
DataObjects/Core_enum.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
976da64
..
0ed61c1
100644
(file)
--- a/
DataObjects/Core_enum.php
+++ b/
DataObjects/Core_enum.php
@@
-375,11
+375,16
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
$t->insert();
}else{
$t->find(true); // fetch it..
+ $o = clone($t);
+
if ( isset($row['is_system_enum'])) {
$t->is_system_enum = isset($row['is_system_enum']) ? $row['is_system_enum'] : $t->is_system_enum;
-
- $t->update();
}
+
+ $t->display_name = isset($row['display_name']) ? $row['display_name'] : '';
+
+ $t->update($o);
+
}
if (!empty($row['cn'])) {
$this->initEnums($row['cn'], array('etype' => $t->name));