From a63ceb28e22873921e70326e758d18c0569d3eb0 Mon Sep 17 00:00:00 2001 From: Chris Smith Date: Sat, 20 Feb 2010 00:15:35 +0000 Subject: merge in r10509 git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_7@10510 89ea8834-ac86-4346-8a33-228a782c2dd0 --- phpBB/viewtopic.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'phpBB/viewtopic.php') diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php index 8f42342a87..29c4e5cdc1 100644 --- a/phpBB/viewtopic.php +++ b/phpBB/viewtopic.php @@ -186,6 +186,13 @@ $sql_array = array( 'FROM' => array(FORUMS_TABLE => 'f'), ); +// Firebird handles two columns of the same name a little differently, this +// addresses that by forcing the forum_id to come from the forums table. +if ($db->sql_layer === 'firebird') +{ + $sql_array['SELECT'] = 'f.forum_id AS forum_id, ' . $sql_array['SELECT']; +} + // The FROM-Order is quite important here, else t.* columns can not be correctly bound. if ($post_id) { -- cgit v1.2.1