From ea5be14933b97334af000f018f95a083eb228013 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Fri, 10 Apr 2009 09:21:47 +0000
Subject: [PATCH] also redirect to topic if forum id not specified (Bug #30855)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9431 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/viewtopic.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index cd0dae2b46..019a1121a0 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -262,9 +262,9 @@ $db->sql_freeresult($result);
 if (!$topic_data)
 {
 	// If post_id was submitted, we try at least to display the topic as a last resort...
-	if ($post_id && $forum_id && $topic_id)
+	if ($post_id && $topic_id)
 	{
-		redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "f=$forum_id&amp;t=$topic_id"));
+		redirect(append_sid("{$phpbb_root_path}viewtopic.$phpEx", "t=$topic_id" . (($forum_id) ? "&amp;f=$forum_id" : '')));
 	}
 
 	trigger_error('NO_TOPIC');