DataObjects/core.sql

[Pman.Core] / DataObjects / Core_enum.php

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index a0267e8..6b03b4d 100644 (file)
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -76,10 +76,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
             CASE WHEN 
                 '$l' = 'en' THEN display_name 
             ELSE
-                CASE WHEN cms_templatestr.txt IS NOT NULL OR cms_templatestr.txt != '' THEN
-                    'a'
+                CASE WHEN cms_templatestr.txt IS NOT NULL AND cms_templatestr.txt != '' THEN
+                    cms_templatestr.txt
                 ELSE
-                    'b'
+                    display_name
                 END
             END as  display_name_tr 
         ");
@@ -182,10 +182,10 @@ class Pman_Core_DataObjects_Core_enum extends DB_DataObject
      * @return array ID of core_enum 
      */
     
-    function lookupAllByName($etype,$name) {
+    function lookupAllByName($etype,$names) {
         $ce = DB_DataObject::Factory('core_enum');
         $ce->etype = $etype;
-        $ce->whereAddIn('name', $name, 'string');
+        $ce->whereAddIn('name', $names, 'string');
         
         if ($ce->count() > 0) {
             return $ce->fetchAll('id');