From e4d562f769b983e8845fe82d0c6fbe32a41c50d4 Mon Sep 17 00:00:00 2001
From: brotherand2 <547996854@qq.com>
Date: Tue, 17 May 2022 08:29:09 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E5=B8=96=E5=86=85?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=80=E9=A1=B5=E5=8F=82=E6=95=B0=E7=BC=BA=E5=A4=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 upload/source/module/forum/forum_viewthread.php | 6 +++---
 upload/template/default/forum/viewthread.htm    | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/upload/source/module/forum/forum_viewthread.php b/upload/source/module/forum/forum_viewthread.php
index 8d356c40b..1d85b59d0 100644
--- a/upload/source/module/forum/forum_viewthread.php
+++ b/upload/source/module/forum/forum_viewthread.php
@@ -503,8 +503,7 @@ if(empty($_GET['viewpid'])) {
 			$_G['forum_numpost'] = $_G['forum_thread']['replies'] + 2 - $_G['forum_numpost'] + ($page > 1 ? 1 : 0);
 		}
 	}
-	$multipage = multi($_G['forum_thread']['replies'] + 1, $_G['ppp'], $page, 'forum.php?mod=viewthread&tid='.$_G['tid'].
-		($_G['forum_thread']['is_archived'] ? '&archive='.$_G['forum_thread']['archiveid'] : '').
+	$multipageparam = ($_G['forum_thread']['is_archived'] ? '&archive='.$_G['forum_thread']['archiveid'] : '').
 		'&amp;extra='.$_GET['extra'].
 		($ordertype && $ordertype != getstatus($_G['forum_thread']['status'], 4) ? '&amp;ordertype='.$ordertype : '').
 		(isset($_GET['highlight']) ? '&amp;highlight='.rawurlencode($_GET['highlight']) : '').
@@ -512,7 +511,8 @@ if(empty($_GET['viewpid'])) {
 		(!empty($_GET['from']) ? '&amp;from='.$_GET['from'] : '').
 		(!empty($_GET['checkrush']) ? '&amp;checkrush='.$_GET['checkrush'] : '').
 		(!empty($_GET['modthreadkey']) ? '&amp;modthreadkey='.rawurlencode($_GET['modthreadkey']) : '').
-		$specialextra);
+		$specialextra;
+	$multipage = multi($_G['forum_thread']['replies'] + 1, $_G['ppp'], $page, 'forum.php?mod=viewthread&tid='.$_G['tid'].$multipageparam); 
 } else {
 	$_GET['viewpid'] = intval($_GET['viewpid']);
 	$pageadd = "AND p.pid='$_GET[viewpid]'";
diff --git a/upload/template/default/forum/viewthread.htm b/upload/template/default/forum/viewthread.htm
index 08ddc59d5..b631f1a2a 100644
--- a/upload/template/default/forum/viewthread.htm
+++ b/upload/template/default/forum/viewthread.htm
@@ -355,7 +355,7 @@ $_G['forum_tagscript']
 
 <!--{if $multipage && $page < $_G['setting']['threadmaxpages'] && $page < $_G['page_next']}-->
 <!--{eval $nxtpage = $page + 1;}-->
-	<div class="pgbtn"><a href="forum.php?mod=viewthread&tid=$_G[tid]{if $_GET[authorid]}&authorid=$_GET[authorid]{/if}&page=$nxtpage" hidefocus="true" class="bm_h">{lang next_page_extra}</a></div>
+	<div class="pgbtn"><a href="forum.php?mod=viewthread&tid=$_G[tid]{$multipageparam}&page=$nxtpage" hidefocus="true" class="bm_h">{lang next_page_extra}</a></div>
 <!--{/if}-->
 
 <div class="pgs mtm mbm cl">
@@ -410,7 +410,7 @@ $_G['forum_tagscript']
 <!--{/if}-->
 
 <!--{if !IS_ROBOT && $_G['setting']['threadmaxpages'] > 1}-->
-	<script type="text/javascript">document.onkeyup = function(e){keyPageScroll(e, <!--{if $page > 1}-->1<!--{else}-->0<!--{/if}-->, <!--{if $page < $_G['setting']['threadmaxpages'] && $page < $_G['page_next']}-->1<!--{else}-->0<!--{/if}-->, 'forum.php?mod=viewthread&tid=$_G[tid]<!--{if $_GET[authorid]}-->&authorid=$_GET[authorid]<!--{/if}-->', $page);}</script>
+	<script type="text/javascript">document.onkeyup = function(e){keyPageScroll(e, <!--{if $page > 1}-->1<!--{else}-->0<!--{/if}-->, <!--{if $page < $_G['setting']['threadmaxpages'] && $page < $_G['page_next']}-->1<!--{else}-->0<!--{/if}-->, 'forum.php?mod=viewthread&tid=$_G[tid]{$multipageparam}', $page);}</script>
 <!--{/if}-->
 </div>
 
-- 
Gitee