projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c1ac961
)
DataObjects/Core_enum.php
author
Alan Knowles
<alan@roojs.com>
Wed, 16 Jan 2013 02:30:22 +0000
(10:30 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 16 Jan 2013 02:30:22 +0000
(10:30 +0800)
DataObjects/Core_enum.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
636d0a4
..
c67038d
100644
(file)
--- a/
DataObjects/Core_enum.php
+++ b/
DataObjects/Core_enum.php
@@
-173,8
+173,15
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
$t->setFrom($row);
$t->setFrom($base);
+ unset($t->seqid); // these might have been changed
+ unset($t->displayName); // these might have been changed
+
+
+ if (!$t->find(true))
+ {
+ $t->setFrom($row);
+ $t->setFrom($base);
- if (!$t->find(true)) {
if (!empty($base['etype']) && empty($row['seqid'])) {
$t->seqid = $seq_id;
$seq_id++;