projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8b50171
)
DataObjects/Core_enum.php
author
Edward
<edward@roojs.com>
Tue, 9 Jun 2015 03:15:22 +0000
(11:15 +0800)
committer
Edward
<edward@roojs.com>
Tue, 9 Jun 2015 03:15:22 +0000
(11:15 +0800)
DataObjects/Core_enum.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
3a3b6e2
..
5004dad
100644
(file)
--- a/
DataObjects/Core_enum.php
+++ b/
DataObjects/Core_enum.php
@@
-338,7
+338,7
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
}
- function merge($to, $roo)
+ function merge($
merge_
to, $roo)
{
$affects = array();
@@
-368,7
+368,7
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
foreach ($chk->fetchAll() as $c){
$cc = clone ($c);
- $c->{$ka[1]} = $to;
+ $c->{$ka[1]} = $
merge_
to;
$c->update($cc);
}
}