From: Edward <edward@roojs.com>
Date: Tue, 9 Jun 2015 03:15:22 +0000 (+0800)
Subject: DataObjects/Core_enum.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=08ddb449ad9aca6ac3888ad6db1515cd6e494b35

DataObjects/Core_enum.php
---

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 3a3b6e2e..5004dad6 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -338,7 +338,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
     }
     
-    function merge($to, $roo)
+    function merge($merge_to, $roo)
     {
         $affects  = array();
         
@@ -368,7 +368,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
 
             foreach ($chk->fetchAll() as $c){
                 $cc = clone ($c);
-                $c->{$ka[1]} = $to;
+                $c->{$ka[1]} = $merge_to;
                 $c->update($cc);
             }
         }