From: Edward <edward@roojs.com>
Date: Fri, 14 Feb 2014 12:40:24 +0000 (+0800)
Subject: DataObjects/Core_enum.php
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=45cf10652c5ca3e1beff9033ebc50f3aa6acb749

DataObjects/Core_enum.php
---

diff --git a/DataObjects/Core_enum.php b/DataObjects/Core_enum.php
index 2c905511..e13f4f22 100644
--- a/DataObjects/Core_enum.php
+++ b/DataObjects/Core_enum.php
@@ -76,7 +76,7 @@ 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
+                CASE WHEN cms_templatestr.txt IS NOT NULL AND cms_templatestr.txt != '' THEN
                     cms_templatestr.txt
                 ELSE
                     display_name