projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e8c6e31
)
DataObjects/Core_enum.php
author
Edward
<edward@roojs.com>
Fri, 14 Feb 2014 12:40:24 +0000
(20:40 +0800)
committer
Edward
<edward@roojs.com>
Fri, 14 Feb 2014 12:40:24 +0000
(20:40 +0800)
DataObjects/Core_enum.php
patch
|
blob
|
history
diff --git
a/DataObjects/Core_enum.php
b/DataObjects/Core_enum.php
index
2c90551
..
e13f4f2
100644
(file)
--- 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