From d00e12eba81238a86731911701efbd7cf3d63b40 Mon Sep 17 00:00:00 2001
From: brotherand2 <547996854@qq.com>
Date: Sat, 28 May 2022 04:34:30 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=BE=97=E4=BF=AE=E6=94=B9=E7=9A=84?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=BC=BA=E5=88=B6=E4=BF=AE=E6=94=B9=E6=9C=AA?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=B5=84=E6=96=99=E4=B8=8D=E5=BE=97=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=201=20=E6=88=91=E4=B8=8A=E6=AC=A1=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E7=9A=84PR,=E6=9C=AA=E6=AF=94=E8=BE=83=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E8=BF=87=E6=9C=9F,=E5=AF=BC=E8=87=B4?=
 =?UTF-8?q?=E5=88=9A=E5=8F=91=E7=9A=84=E5=B8=96=E5=AD=90=E5=B0=B1=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E5=88=86=E7=B1=BB=E4=BF=A1=E6=81=AF=E8=BF=87=E6=9C=9F?=
 =?UTF-8?q?=E7=9C=8B=E4=B8=8D=E5=88=B0=202=20$=5FG['tid']=20&&=20$pid?=
 =?UTF-8?q?=E5=8F=96=E5=8F=8D=E6=98=AFnewthread=E4=BA=86,=E8=B5=84?=
 =?UTF-8?q?=E6=96=99=E4=BF=AE=E6=94=B9=E4=B8=8D=E6=98=AFnewthread,?=
 =?UTF-8?q?=E6=98=AFedit?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/function/function_threadsort.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upload/source/function/function_threadsort.php b/upload/source/function/function_threadsort.php
index 079805004..dddc2b9cb 100644
--- a/upload/source/function/function_threadsort.php
+++ b/upload/source/function/function_threadsort.php
@@ -454,7 +454,7 @@ function threadsortshow($sortid, $tid) {
 		}
 	}
 
-	$threadsortshow['optionlist'] = !$sortdataexpiration ? $_G['forum_option'] : 'expire';
+	$threadsortshow['optionlist'] = !$sortdataexpiration || $sortdataexpiration >= $_G['timestamp'] ? $_G['forum_option'] : 'expire';
 	$threadsortshow['typetemplate'] = $typetemplate;
 	$threadsortshow['expiration'] = dgmdate($sortdataexpiration, 'd');
 
@@ -679,7 +679,7 @@ function threadsort_validator($sortoption, $pid) {
 			showmessage('threadtype_toolong_invalid', "forum.php?mod=post&action=$postaction&fid=$_G[fid]&sortid=".$_G['forum_selectsortid'], array('typetitle' => $_G['forum_checkoption'][$var]['title']));
 		} elseif($sortoption[$var] && (($_G['forum_checkoption'][$var]['maxnum'] && $sortoption[$var] > $_G['forum_checkoption'][$var]['maxnum']) || ($_G['forum_checkoption'][$var]['minnum'] && $sortoption[$var] < $_G['forum_checkoption'][$var]['minnum']))) {
 			showmessage('threadtype_num_invalid', "forum.php?mod=post&action=$postaction&fid=$_G[fid]&sortid=".$_G['forum_selectsortid'], array('typetitle' => $_G['forum_checkoption'][$var]['title']));
-		} elseif($sortoption[$var] && $_G['forum_checkoption'][$var]['unchangeable'] && !($_G['tid'] && $pid)) {
+		} elseif($sortoption[$var] && $_G['forum_checkoption'][$var]['unchangeable'] && ($_G['tid'] && $pid)) {
 			showmessage('threadtype_unchangeable_invalid', "forum.php?mod=post&action=$postaction&fid=$_G[fid]&sortid=".$_G['forum_selectsortid'], array('typetitle' => $_G['forum_checkoption'][$var]['title']));
 		} elseif($sortoption[$var] && ($_G['forum_checkoption'][$var]['type'] == 'select')) {
 			if($_G['forum_optionlist'][$_G['forum_checkoption'][$var]['optionid']]['choices'][$sortoption[$var]]['level'] != 1) {
-- 
Gitee