From 497dd89dec0332dc853dce9dd8bb325326ea6768 Mon Sep 17 00:00:00 2001
From: edward <edward@roojs.com>
Date: Fri, 4 Nov 2016 13:34:33 +0800
Subject: [PATCH] DataObjects/Core_company.php

---
 DataObjects/Core_company.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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) && 
-- 
2.39.2