From b68de2323d6444b4b3685a98bbcb9500a38e45cb Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 16 Dec 2009 15:48:23 +0000
Subject: merge changes from 3.0.x branch

git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/viewtopic.php | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'phpBB/viewtopic.php')

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 7fb954017d..a114940449 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1726,6 +1726,12 @@ if (empty($_REQUEST['f']))
 	$_REQUEST['f'] = $forum_id;
 }
 
+// We need to do the same with the topic_id. See #53025.
+if (empty($_REQUEST['t']) && !empty($topic_id))
+{
+	$_REQUEST['t'] = $topic_id;
+}
+
 // Output the page
 page_header($user->lang['VIEW_TOPIC'] . ' - ' . $topic_data['topic_title'], true, $forum_id);
 
-- 
cgit v1.2.1