X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=92fc73dec4edf403d18b47d37ccce359b91ee05e;hb=a68035dcf185ca59be059b28452857774aeb9f6f;hp=09988919022c605e81d1cad8eb4456b1d00886ad;hpb=d6cc8e8612060e1b9bf9ce1789dd82f4cfcfdce9;p=Pman.Core diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index 09988919..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,8 +395,9 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject function merge($merge_to, $roo) { $affects = array(); - - $all_links = $GLOBALS['_DB_DATAOBJECT']['LINKS'][$this->_database]; + $tn = $this->tableName(); + $x = $this->factory($tn); + $all_links = $x->databaseLinks(); foreach($all_links as $tbl => $links) { foreach($links as $col => $totbl_col) {