diff --git a/src/admin/content_list.php b/src/admin/content_list.php index b9aceabf..900e76ef 100644 --- a/src/admin/content_list.php +++ b/src/admin/content_list.php @@ -56,7 +56,7 @@ if (empty($totalresult) && empty($keyword) && empty($orderby) && empty($flag)) { if (!empty($arcrank)) { $tinyQuerys[] = " arcrank='$arcrank' "; } else { - $tinyQuerys[] = " arcrank > -2 "; + $tinyQuerys[] = " arcrank >= 0 "; } if (!empty($mid)) { $tinyQuerys[] = " mid='$mid' "; diff --git a/src/admin/templets/ad_main.htm b/src/admin/templets/ad_main.htm index 664da2ad..dea6ddea 100644 --- a/src/admin/templets/ad_main.htm +++ b/src/admin/templets/ad_main.htm @@ -50,7 +50,7 @@ 结束时间 管理 - {dede:datalist} + {dede:datalist empty='
暂无内容
'} {dede:field.aid /} {dede:field.clsname function='TestType(@me,1)'/} diff --git a/src/admin/templets/article_coonepage_rule.htm b/src/admin/templets/article_coonepage_rule.htm index b41ac3e8..ee1416c1 100644 --- a/src/admin/templets/article_coonepage_rule.htm +++ b/src/admin/templets/article_coonepage_rule.htm @@ -108,7 +108,7 @@ 网站名称 操作 - {dede:datalist} + {dede:datalist empty='
暂无内容
'} diff --git a/src/admin/templets/article_keywords_main.htm b/src/admin/templets/article_keywords_main.htm index 088cf27e..d49a4190 100644 --- a/src/admin/templets/article_keywords_main.htm +++ b/src/admin/templets/article_keywords_main.htm @@ -72,7 +72,7 @@
- {dede:datalist} + {dede:datalist empty='
暂无内容
'} diff --git a/src/admin/templets/article_keywords_select.htm b/src/admin/templets/article_keywords_select.htm index 194310d6..7cee24a9 100644 --- a/src/admin/templets/article_keywords_select.htm +++ b/src/admin/templets/article_keywords_select.htm @@ -77,7 +77,7 @@ function AddNewKw() - {dede:datalist} + {dede:datalist empty='
暂无内容
'} {dede:field.keyword/} {/dede:datalist} diff --git a/src/admin/templets/cards_manmage.htm b/src/admin/templets/cards_manmage.htm index 6a06ad91..ceef5a1f 100644 --- a/src/admin/templets/cards_manmage.htm +++ b/src/admin/templets/cards_manmage.htm @@ -68,7 +68,7 @@ 使用会员 - {dede:datalist} + {dede:datalist empty='
暂无内容
'} {dede:field.cardid/} diff --git a/src/admin/templets/catalog_add.htm b/src/admin/templets/catalog_add.htm index 09c9d68e..e85332d1 100644 --- a/src/admin/templets/catalog_add.htm +++ b/src/admin/templets/catalog_add.htm @@ -234,8 +234,8 @@ function CheckCross() { 栏目大图: - - + + diff --git a/src/admin/templets/catalog_edit.htm b/src/admin/templets/catalog_edit.htm index 7822c98d..4fc73342 100644 --- a/src/admin/templets/catalog_edit.htm +++ b/src/admin/templets/catalog_edit.htm @@ -212,8 +212,8 @@ function CheckCross() { 栏目大图: - - + + diff --git a/src/admin/templets/content_i_list.htm b/src/admin/templets/content_i_list.htm index 092cd8ee..406cc280 100644 --- a/src/admin/templets/content_i_list.htm +++ b/src/admin/templets/content_i_list.htm @@ -82,7 +82,7 @@ img{margin-right:0} - {dede:datalist} + {dede:datalist empty='
暂无内容
'} diff --git a/src/admin/templets/content_list.htm b/src/admin/templets/content_list.htm index 2ea3c003..a6325a1a 100644 --- a/src/admin/templets/content_list.htm +++ b/src/admin/templets/content_list.htm @@ -87,7 +87,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/content_s_list.htm b/src/admin/templets/content_s_list.htm index fd34e6d4..a6c994e9 100644 --- a/src/admin/templets/content_s_list.htm +++ b/src/admin/templets/content_s_list.htm @@ -153,7 +153,7 @@ function noSelAll() { - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/content_select_list.htm b/src/admin/templets/content_select_list.htm index f7c95aef..27d8b93a 100644 --- a/src/admin/templets/content_select_list.htm +++ b/src/admin/templets/content_select_list.htm @@ -63,7 +63,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/content_sg_list.htm b/src/admin/templets/content_sg_list.htm index cfdc0cf8..0fa89a24 100644 --- a/src/admin/templets/content_sg_list.htm +++ b/src/admin/templets/content_sg_list.htm @@ -197,7 +197,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/diy_main.htm b/src/admin/templets/diy_main.htm index 71fb9c07..d0e22d2a 100644 --- a/src/admin/templets/diy_main.htm +++ b/src/admin/templets/diy_main.htm @@ -31,7 +31,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/erradd.htm b/src/admin/templets/erradd.htm index a7e532b0..1f24b7a8 100644 --- a/src/admin/templets/erradd.htm +++ b/src/admin/templets/erradd.htm @@ -69,7 +69,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/feedback_main.htm b/src/admin/templets/feedback_main.htm index 1876a590..876fd563 100644 --- a/src/admin/templets/feedback_main.htm +++ b/src/admin/templets/feedback_main.htm @@ -88,7 +88,7 @@
文档图片发布人 操作
暂无内容
{dede:field.id/} 权限 属性
暂无内容
{dede:field.id/} 权限 属性
暂无内容
{dede:field.id/}发布人 操作
暂无内容
{dede:field.id/} 表名 管理
暂无内容
{dede:field.diyid/} {dede:field.name/}错误内容 修改建议
暂无内容
- {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/tags_main.htm b/src/admin/templets/tags_main.htm index 9e372187..e86a1e3c 100644 --- a/src/admin/templets/tags_main.htm +++ b/src/admin/templets/tags_main.htm @@ -130,7 +130,7 @@ - {dede:datalist} + {dede:datalist empty=''} - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/vote_main.htm b/src/admin/templets/vote_main.htm index c3e54857..f074051b 100644 --- a/src/admin/templets/vote_main.htm +++ b/src/admin/templets/vote_main.htm @@ -25,7 +25,7 @@ - {dede:datalist} + {dede:datalist empty=''}
暂无内容
diff --git a/src/admin/templets/friendlink_main.htm b/src/admin/templets/friendlink_main.htm index 4f4851f7..35b75c15 100644 --- a/src/admin/templets/friendlink_main.htm +++ b/src/admin/templets/friendlink_main.htm @@ -87,7 +87,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/log_list.htm b/src/admin/templets/log_list.htm index 471891ab..e1c5c9c6 100644 --- a/src/admin/templets/log_list.htm +++ b/src/admin/templets/log_list.htm @@ -91,7 +91,7 @@ - {dede:datalist} + {dede:datalist empty=''} - {dede:datalist} + {dede:datalist empty=''} - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/member_operations.htm b/src/admin/templets/member_operations.htm index 70d608a0..eba61daf 100644 --- a/src/admin/templets/member_operations.htm +++ b/src/admin/templets/member_operations.htm @@ -102,7 +102,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/member_pm.htm b/src/admin/templets/member_pm.htm index b4025140..ee6423d5 100644 --- a/src/admin/templets/member_pm.htm +++ b/src/admin/templets/member_pm.htm @@ -60,7 +60,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/mychannel_main.htm b/src/admin/templets/mychannel_main.htm index cc099d20..84757290 100644 --- a/src/admin/templets/mychannel_main.htm +++ b/src/admin/templets/mychannel_main.htm @@ -33,7 +33,7 @@ - {dede:datalist} + {dede:datalist empty=''} - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/mytag_main.htm b/src/admin/templets/mytag_main.htm index ec33c9ea..ce83c507 100644 --- a/src/admin/templets/mytag_main.htm +++ b/src/admin/templets/mytag_main.htm @@ -25,7 +25,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/plus_main.htm b/src/admin/templets/plus_main.htm index 4f0a2c63..e18617e2 100644 --- a/src/admin/templets/plus_main.htm +++ b/src/admin/templets/plus_main.htm @@ -20,7 +20,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/recycling.htm b/src/admin/templets/recycling.htm index 78596dd0..73387e43 100644 --- a/src/admin/templets/recycling.htm +++ b/src/admin/templets/recycling.htm @@ -82,7 +82,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/shops_operations.htm b/src/admin/templets/shops_operations.htm index 5fc4d058..8ca3b73d 100644 --- a/src/admin/templets/shops_operations.htm +++ b/src/admin/templets/shops_operations.htm @@ -120,7 +120,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/stepselect_main.htm b/src/admin/templets/stepselect_main.htm index 6dfca567..608f6f93 100644 --- a/src/admin/templets/stepselect_main.htm +++ b/src/admin/templets/stepselect_main.htm @@ -287,7 +287,7 @@ if(!empty($egroup)) - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/sys_admin_user.htm b/src/admin/templets/sys_admin_user.htm index 171f1ee6..1760f79f 100644 --- a/src/admin/templets/sys_admin_user.htm +++ b/src/admin/templets/sys_admin_user.htm @@ -38,7 +38,7 @@ - {dede:datalist} + {dede:datalist empty=''} diff --git a/src/admin/templets/sys_payment.htm b/src/admin/templets/sys_payment.htm index 9d7d0bbe..0f58882f 100644 --- a/src/admin/templets/sys_payment.htm +++ b/src/admin/templets/sys_payment.htm @@ -32,7 +32,7 @@ - {dede:datalist} + {dede:datalist empty=''} @@ -55,7 +55,7 @@ {/dede:datalist} - +
顺序 管理
暂无内容
{dede:field.webname function='dede_htmlspecialchars(@me)'/}
地址:{dede:field.url/}
Query参数
暂无内容
diff --git a/src/admin/templets/media_main.htm b/src/admin/templets/media_main.htm index bee6cccd..aef1e9ff 100644 --- a/src/admin/templets/media_main.htm +++ b/src/admin/templets/media_main.htm @@ -118,7 +118,7 @@ 管理
暂无内容
diff --git a/src/admin/templets/member_main.htm b/src/admin/templets/member_main.htm index 403a6bd3..adbccba0 100644 --- a/src/admin/templets/member_main.htm +++ b/src/admin/templets/member_main.htm @@ -90,7 +90,7 @@ 最后登录 操作
暂无内容
{dede:field.mid/}会员
暂无内容
' class='np'>文件夹 操作
暂无内容
{dede:field.sendtime function='GetDateMk(@me)'/} {dede:field.subject function='dede_htmlspecialchars(@me)'/}
模型 管理
暂无内容
{dede:field.id /} diff --git a/src/admin/templets/mynews_main.htm b/src/admin/templets/mynews_main.htm index 45f0fde0..4d1edb85 100644 --- a/src/admin/templets/mynews_main.htm +++ b/src/admin/templets/mynews_main.htm @@ -28,7 +28,7 @@ 发布人 操作
暂无内容
{dede:field.aid/} {dede:field.title /}结束时间 管理
暂无内容
{dede:field.aid /} {dede:field.tagname /}插件作者 管理
暂无内容
{dede:field.aid /} {dede:field.plusname /}点击 操作
暂无内容
用户
暂无内容
' class='np'>
暂无内容
频道 管理项
暂无内容
{dede:field.userid /} {dede:field.uname /}
排序 管理
暂无内容
{dede:field.name /} {dede:field.description /}
{dede:pagelist listsize=5/} {dede:pagelist listsize=5/}
操作
暂无内容
暂无内容
状态 管理
暂无内容
{dede:field.aid /} diff --git a/src/system/datalistcp.class.php b/src/system/datalistcp.class.php index 20f881ca..559d894e 100755 --- a/src/system/datalistcp.class.php +++ b/src/system/datalistcp.class.php @@ -58,15 +58,7 @@ class DataListCP */ function __construct($tplfile = '') { - if ($GLOBALS['cfg_dbtype'] == 'mysql') { - if ($GLOBALS['cfg_mysql_type'] == 'mysqli' && function_exists("mysqli_init")) { - $dsql = $GLOBALS['dsqli']; - } else { - $dsql = $GLOBALS['dsql']; - } - } else { - $dsql = $GLOBALS['dsqlitete']; - } + global $dsql; $this->sourceSql = ''; $this->pageSize = 25; $this->queryTime = 0; diff --git a/src/system/dedetemplate.class.php b/src/system/dedetemplate.class.php index f95e83df..f219685b 100755 --- a/src/system/dedetemplate.class.php +++ b/src/system/dedetemplate.class.php @@ -791,10 +791,11 @@ class DedeTemplate } $rsvalue = '<'.'?php'."\r\n".'$atts = array();'."\r\n".$rsvalue; $rsvalue .= '$blockValue = $this->refObj->GetArcList($atts,$this->refObj,$fields); '."\r\n"; + $rsvalue .= '$total = $this->refObj->totalResult;'."\r\n"; $rsvalue .= 'if(is_array($blockValue)){'."\r\n"; $rsvalue .= 'foreach( $blockValue as $key=>$fields )'."\r\n{\r\n".'?'.">"; $rsvalue .= $cTag->GetInnerText(); - $rsvalue .= '<'.'?php'."\r\n}\r\n}".'?'.'>'; + $rsvalue .= '<'.'?php'."\r\n}if(\$total==0 && !empty(\$atts['empty'])) echo \$atts['empty'];\r\n}".'?'.'>'; $cTag->tagValue = $rsvalue; } else if ($tagname == 'pagelist') { //生成属性数组