projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b514ca4
)
DataObjects/Core_company.php
author
edward
<edward@roojs.com>
Fri, 4 Nov 2016 05:34:33 +0000
(13:34 +0800)
committer
edward
<edward@roojs.com>
Fri, 4 Nov 2016 05:34:33 +0000
(13:34 +0800)
DataObjects/Core_company.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_company.php
b/DataObjects/Core_company.php
index
c7e703f
..
6953eef
100644
(file)
--- a/
DataObjects/Core_company.php
+++ b/
DataObjects/Core_company.php
@@
-247,8
+247,8
@@
class Pman_Core_DataObjects_Core_Company extends DB_DataObject
function beforeUpdate($old, $q,$roo)
{
- if(!empty($
request
['_merge_id'])){
- $this->merge($
request
['_merge_id'], $roo);
+ if(!empty($
q
['_merge_id'])){
+ $this->merge($
q
['_merge_id'], $roo);
}
if(!empty($this->is_system) &&