X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_company.php;h=6953eef60c60754a59559d6f3eb453d46c88f8b3;hb=497dd89dec0332dc853dce9dd8bb325326ea6768;hp=c7e703f641ee996d6643721f5a312b38ed757836;hpb=b514ca4f505aeb893d796f4cec9efeb2b32c5007;p=Pman.Core

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