From 2c1ab6851db31534d175a91637c97539902aae81 Mon Sep 17 00:00:00 2001
From: xushubieli <xushubieli@qq.com>
Date: Mon, 25 Apr 2022 16:22:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=A2=9E=E5=BC=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/admin/templets/sys_info_mark.htm     |  2 +-
 src/system/taglib/channelartlist.lib.php | 23 +++++++++--------------
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/admin/templets/sys_info_mark.htm b/src/admin/templets/sys_info_mark.htm
index ad633826..3bf4461b 100644
--- a/src/admin/templets/sys_info_mark.htm
+++ b/src/admin/templets/sys_info_mark.htm
@@ -79,7 +79,7 @@
         <td height="26">水印位置：</td>
         <td>
           <label><input class="np" type="radio" name="get_photo_waterpos" value="0" <?php if($photo_waterpos==0) echo ' checked'; ?>> 随机位置</label>
-          <table border="1" cellspacing="0" cellpadding="0" class="table maintable" style="width:300px!important">
+          <table border="1" cellspacing="0" cellpadding="0" class="table maintable" style="width:260px!important">
             <tr>
               <td width="33%">
                 <label><input class="np" type="radio" name="get_photo_waterpos" value="1" <?php if($photo_waterpos==1) echo ' checked'; ?>> 顶部居左 </label>
diff --git a/src/system/taglib/channelartlist.lib.php b/src/system/taglib/channelartlist.lib.php
index a14e3de9..ce1cfcd0 100755
--- a/src/system/taglib/channelartlist.lib.php
+++ b/src/system/taglib/channelartlist.lib.php
@@ -33,13 +33,13 @@ function lib_channelartlist(&$ctag, &$refObj)
     if (empty($totalnum)) $totalnum = 20;
     //获得类别ID总数的信息
     $typeids = array();
-    if ($typeid == 0 || $typeid == 'top') {
-        $tpsql = " reid=0 AND ispart<>2 AND ishidden<>1 AND channeltype>0 ";
+    if($typeid==0 || $typeid=='top') {
+        $tpsql = " reid=0 AND channeltype>0 AND ishidden<>1 ";
     } else {
-        if (!preg_match('#,#', $typeid)) {
-            $tpsql = " reid='$typeid' AND ispart<>2 AND ishidden<>1 ";
+        if(!preg_match('#,#', $typeid)) {
+            $tpsql = " reid='$typeid' AND ishidden<>1 ";
         } else {
-            $tpsql = " id IN($typeid) AND ispart<>2 AND ishidden<>1 ";
+            $tpsql = " id IN($typeid) AND ishidden<>1 ";
         }
     }
     //否定指定栏目
@@ -59,18 +59,13 @@ function lib_channelartlist(&$ctag, &$refObj)
         $pv = new PartView($typeids[$i]['id']);
         $pv->Fields['typeurl'] = GetOneTypeUrlA($typeids[$i]);
         //栏目高亮
-        if (!is_null($refObj->TypeLink->TypeInfos)) {
-            if($typeids[$i]['id'] == $refObj->TypeLink->TypeInfos['id'] || $typeids[$i]['id'] == $refObj->TypeLink->TypeInfos['reid'] || $typeids[$i]['id'] == $refObj->TypeLink->TypeInfos['topid'] || $typeids[$i]['id'] == GetTopid($refObj->TypeLink->TypeInfos['id']) )
-            {
-                $pv->Fields['currentstyle'] = $currentstyle ? $currentstyle : 'current';
-            } else {
-                $pv->Fields['currentstyle'] = '';
-            }
+        if($typeids[$i]['id'] == $refObj->TypeLink->TypeInfos['id'] || $typeids[$i]['id'] == $refObj->TypeLink->TypeInfos['reid'] || $typeids[$i]['id'] == $refObj->TypeLink->TypeInfos['topid'] || $typeids[$i]['id'] == GetTopid($refObj->TypeLink->TypeInfos['id']) )
+        {
+            $pv->Fields['currentstyle'] = $currentstyle ? $currentstyle : 'current';
         } else {
             $pv->Fields['currentstyle'] = '';
         }
-		
-        $pv->SetTemplet($innertext, 'string');
+        $pv->SetTemplet($innertext,'string');
         $artlist .= $pv->GetResult();
         $GLOBALS['itemparity'] = ($GLOBALS['itemparity'] == 1 ? 2 : 1);
     }