DataObjects/Core_enum.php

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 473a57a..8aaf03e 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -2,8 +2,8 @@
 /**
  * Table Definition for core enum - it's used in pulldowns or simple option lists.
  */
-//class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
-require_once '../../PDO_DataObject/PDO/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
+
 class Pman_Core_DataObjects_Core_enum extends DB_DataObject
 {
     ###START_AUTOCODE
@@ -156,9 +156,8 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
     {
         $tn = $this->tableName();
         $x = $this->factory($tn);
-
+        
         if(empty($req['etype']) || !strlen(trim($req['etype'])) ){
-
             if (empty($req['name']) || !strlen(trim($req['name']))) {
                 $roo->jerr('name or etype missing');
             }
@@ -167,7 +166,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
                 $roo->jerr("name already exists - '{$req['name']}'"  );
             }
         } else if (!empty($req['_bulk_names'])) {
-
+            
             $lines = explode("\n", $req['_bulk_names']);
             foreach($lines as $l) {
                 $l = trim($l);
@@ -352,7 +351,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 +394,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) {