aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2009-12-16 15:48:23 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2009-12-16 15:48:23 +0000
commitb68de2323d6444b4b3685a98bbcb9500a38e45cb (patch)
tree6046a64891cfc1c2edb3f4b42b0e799f2921c155 /phpBB/viewtopic.php
parent51d173ff1e6d3764be4701b92ecfd68007ad1c81 (diff)
downloadforums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.gz
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.bz2
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.tar.xz
forums-b68de2323d6444b4b3685a98bbcb9500a38e45cb.zip
merge changes from 3.0.x branch
git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php6
1 files changed, 6 insertions, 0 deletions
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);