projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_enum.php
[Pman.Core]
/
DataObjects
/
Core_enum.php
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
06d6488
..
ea3c02a
100644
(file)
--- a/
DataObjects/Core_enum.php
+++ b/
DataObjects/Core_enum.php
@@
-26,7
+26,7
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
// DB_DataObject::debugLevel(1);
if (!empty($q['query']['empty_etype'])) {
// DB_DataObject::debugLevel(1);
if (!empty($q['query']['empty_etype'])) {
- $this->whereAdd("etype = ''");
+ $this->whereAdd("
core_enum.
etype = ''");
}
// this should be handled by roo... using '!name[0]' ....
}
// this should be handled by roo... using '!name[0]' ....
@@
-338,7
+338,7
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
}
}
- function merge($to, $roo)
+ function merge($
merge_
to, $roo)
{
$affects = array();
{
$affects = array();
@@
-368,8
+368,8
@@
class Pman_Core_DataObjects_Core_enum extends DB_DataObject
foreach ($chk->fetchAll() as $c){
$cc = clone ($c);
foreach ($chk->fetchAll() as $c){
$cc = clone ($c);
- $c->{$ka[1]} = $to;
- $c->update($
o
);
+ $c->{$ka[1]} = $
merge_
to;
+ $c->update($
cc
);
}
}
}
}