X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=ea3c02a7d758903f5b189bc0e98bc0dce146efae;hb=4de286975b738fcc7a5c14079f4b7d5148111871;hp=3a3b6e2ebcf92a95bf414e0a208a30e86e8d381b;hpb=61887df56e50a9a4b2c0a50677f06151e827d557;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 3a3b6e2e..ea3c02a7 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -26,7 +26,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         
 //        DB_DataObject::debugLevel(1);
         if (!empty($q['query']['empty_etype'])) {
-            $this->whereAdd("etype = ''");
+            $this->whereAdd("core_enum.etype = ''");
         }
         
         // this should be handled by roo... using '!name[0]' ....
@@ -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);
             }
         }