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

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 79752c8e..92fc73de 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -352,7 +352,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
 
             $t->name = isset($row['name']) ? $row['name'] : '';
 
-            if (empty($t->name)) {
+            if (empty($t->name) && $t->name != 0) {
                 print_R($data);
                 die("ERROR: invalid name used for core_enum\n\n");
             }
@@ -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) {