From efc05d95da62ba83ad23841d7f4e51dddc387c0a Mon Sep 17 00:00:00 2001
From: brotherand2 <547996854@qq.com>
Date: Wed, 25 May 2022 03:54:26 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=B8=96=E5=AD=90?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=B8=BB=E9=A2=98=E5=88=86=E7=B1=BB,?=
 =?UTF-8?q?=E5=88=86=E7=B1=BB=E4=BF=A1=E6=81=AFID=E6=9C=AA=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/class/model/model_forum_post.php | 4 +++-
 upload/template/default/forum/viewthread.htm   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/upload/source/class/model/model_forum_post.php b/upload/source/class/model/model_forum_post.php
index 59f9473e3..ead5fb9ca 100644
--- a/upload/source/class/model/model_forum_post.php
+++ b/upload/source/class/model/model_forum_post.php
@@ -387,7 +387,7 @@ class model_forum_post extends discuz_model {
 
 
 
-			$this->param['readperm'] = $this->group['allowsetreadperm'] ? intval($this->param['readperm']) : ($isorigauthor ? 0 : 'ignore');
+			$this->param['readperm'] = $this->group['allowsetreadperm'] ? intval($this->param['readperm']) : ($isorigauthor ? $this->thread['readperm'] : 'ignore');
 			if($this->thread['special'] != 3) {
 				$this->param['price'] = intval($this->param['price']);
 				$this->param['price'] = $this->thread['price'] < 0 && !$this->thread['special']
@@ -410,6 +410,8 @@ class model_forum_post extends discuz_model {
 			$this->thread['status'] = setstatus(6, $this->param['allownoticeauthor'] ? 1 : 0, $this->thread['status']);
 
 			$displayorder = (empty($this->param['save']) || $this->thread['displayorder'] != -4 ) ? ($this->thread['displayorder'] == -4 ? -4 : $this->thread['displayorder']) : -4;
+			$this->param['typeid'] = isset($this->param['typeid']) && isset($this->forum['threadtypes']['types'][$this->param['typeid']]) && (!$this->forum['threadtypes']['moderators'][$this->param['typeid']] || $this->forum['ismoderator']) ? $this->param['typeid'] : 0;
+			$this->param['sortid'] = $this->param['special'] || !$this->forum['threadsorts']['types'][$this->param['sortid']] ? 0 : $this->param['sortid'];			
 
 
 			$this->param['threadupdatearr']['typeid'] = $this->param['typeid'];
diff --git a/upload/template/default/forum/viewthread.htm b/upload/template/default/forum/viewthread.htm
index b631f1a2a..01e00e69d 100644
--- a/upload/template/default/forum/viewthread.htm
+++ b/upload/template/default/forum/viewthread.htm
@@ -193,7 +193,7 @@
 							[{$_G['forum']['threadtypes']['types'][$_G['forum_thread']['typeid']]}]
 						<!--{/if}-->
 					<!--{/if}-->
-					<!--{if $threadsorts && $_G['forum_thread']['sortid']}-->
+					<!--{if $threadsorts && $_G['forum_thread']['sortid'] && $_G['forum']['threadsorts']['types']['sortid']}-->
 						<a href="forum.php?mod=forumdisplay&fid=$_G[fid]&filter=sortid&sortid=$_G[forum_thread][sortid]">[{$_G['forum']['threadsorts']['types'][$_G['forum_thread']['sortid']]}]</a>
 					<!--{/if}-->
 					<span id="thread_subject">$_G[forum_thread][subject]</span>
-- 
Gitee