diff --git a/lib/dao/dao.class.php b/lib/dao/dao.class.php index a75b11f8a2..bcae2cb6e9 100755 --- a/lib/dao/dao.class.php +++ b/lib/dao/dao.class.php @@ -486,7 +486,7 @@ class dao /* Remove the part after order and limit. */ $subLength = strlen($sql); - $orderPOS = strripos($sql, 'order'); + $orderPOS = strripos($sql, 'order '); $limitPOS = strripos($sql , 'limit'); if($limitPOS) $subLength = $limitPOS; if($orderPOS) $subLength = $orderPOS; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 78368e688b..e77258c70f 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -126,7 +126,7 @@ $lang->exportTypeList['selected'] = 'Only checked'; $lang->themes['default'] = 'Default'; $lang->themes['green'] = 'Green'; $lang->themes['red'] = 'Red'; -$lang->themes['classblue'] = 'Blue'; +$lang->themes['lightblue'] = 'Light Blue'; /* Index mododule menu. */ $lang->index = new stdclass(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index d7d67aa455..76e31501d4 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -130,7 +130,7 @@ $lang->theme = '主题'; $lang->themes['default'] = '默认'; $lang->themes['green'] = '绿色'; $lang->themes['red'] = '红色'; -$lang->themes['classblue'] = '经典蓝'; +$lang->themes['lightblue'] = '亮蓝'; /* 首页菜单设置。*/ $lang->index = new stdclass(); diff --git a/module/common/model.php b/module/common/model.php index 71099cb465..e417a2bf99 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -224,7 +224,7 @@ class commonModel extends model echo "