X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=92fc73dec4edf403d18b47d37ccce359b91ee05e;hb=a68035dcf185ca59be059b28452857774aeb9f6f;hp=90c6d9df6ab3c7fd1c44cdc291007c5155205797;hpb=0c9b8033273442be64da9c963ccb0db50d26a319;p=Pman.Core

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 90c6d9df..92fc73de 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -141,7 +141,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
         }
 
         $tn = $this->tableName();
-        //$x = $this->factory($tn);
+        $x = $this->factory($tn);
         // check if record exists?
         if(isset($request['etype']) &&   !($old->etype == $request['etype'] && $old->name == $request['name'])){
             $x->whereAdd("etype = '{$this->escape($request['etype'])}' AND name = '{$this->escape($request['name'])}'");
@@ -395,7 +395,8 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     function merge($merge_to, $roo)
     {
         $affects  = array();
-
+        $tn = $this->tableName();
+        $x = $this->factory($tn);
         $all_links = $x->databaseLinks();
 
         foreach($all_links as $tbl => $links) {