aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-07-28 13:37:16 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-07-28 13:37:16 +0000
commit1b67e804224a4477031da03ff5108c621cf6d13b (patch)
tree4d6fc01dc442b7d0caaa0e38ac7a96cc5a597101 /phpBB/viewtopic.php
parentd8f2c4a1c4468440cf6c8657891e179bf7d222f5 (diff)
downloadforums-1b67e804224a4477031da03ff5108c621cf6d13b.tar
forums-1b67e804224a4477031da03ff5108c621cf6d13b.tar.gz
forums-1b67e804224a4477031da03ff5108c621cf6d13b.tar.bz2
forums-1b67e804224a4477031da03ff5108c621cf6d13b.tar.xz
forums-1b67e804224a4477031da03ff5108c621cf6d13b.zip
marge
git-svn-id: file:///svn/phpbb/trunk@8696 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index 8c4ddb1505..b7139bd724 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -176,6 +176,7 @@ $sql_array = array(
'FROM' => array(
FORUMS_TABLE => 'f',
+ TOPICS_TABLE => 't',
)
);
@@ -239,7 +240,6 @@ else
}
$sql_array['WHERE'] .= ')';
-$sql_array['FROM'][TOPICS_TABLE] = 't';
// Join to forum table on topic forum_id unless topic forum_id is zero
// whereupon we join on the forum_id passed as a parameter ... this