X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_enum.php;h=66e509ca6a18b7c0634c610a42e87a4264191755;hp=d4ff892f75a60a96cd9bbc13cc0bf46bb958c21c;hb=5d4ac076dc4f620fbb91944eead3e0af66216a03;hpb=092e44fa3d761c0e774f0eb80c9fdf3c9aa5d21a diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php index d4ff892f..66e509ca 100644 --- a/DataObjects/Core_enum.php +++ b/DataObjects/Core_enum.php @@ -2,7 +2,7 @@ /** * Table Definition for core enum - it's used in pulldowns or simple option lists. */ -require_once 'DB/DataObject.php'; +class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php'; class Pman_Core_DataObjects_Core_enum extends DB_DataObject { @@ -115,7 +115,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject function postListFilter($data, $authUser, $q) { - if(!empty($q['cmsTab'])){ + /* if(!empty($q['cmsTab'])){ $ret = array(); foreach($data as $k=>$v){ if($v['name'] == 'element'){ @@ -129,7 +129,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject } $data = $ret; } - + */ return $data; } @@ -347,7 +347,6 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject $seq_id = $t->seqid+1; } } - print_R($data);exit; foreach($data as $row) { $t = DB_DAtaObject::Factory('core_enum'); @@ -355,7 +354,7 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject $t->etype = isset($base['etype']) ? $base['etype'] : $t->etype ; $t->name = isset($row['name']) ? $row['name'] : ''; - print_R($row);exit; + if (empty($t->name)) { print_R($data); die("ERROR: invalid name used for core_enum\n\n");