From: edward <edward@roojs.com>
Date: Fri, 4 Nov 2016 05:34:33 +0000 (+0800)
Subject: DataObjects/Core_company.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=497dd89dec0332dc853dce9dd8bb325326ea6768

DataObjects/Core_company.php
---

diff --git a/DataObjects/Core_company.php b/DataObjects/Core_company.php
index c7e703f6..6953eef6 100644
--- 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) &&