diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:09:11 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-03-02 01:09:11 +0100 |
| commit | 35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40 (patch) | |
| tree | 098e3b3e043f6c3e31c9c922287f76e5ec726e03 /phpBB/viewtopic.php | |
| parent | 3b46681652ad0c235ccdcafc449c3d759335df17 (diff) | |
| parent | 05b5dc316779f67641e17859d5c69f296b24288d (diff) | |
| download | forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar.gz forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar.bz2 forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.tar.xz forums-35a62ed0085df6d767f38d6fbd0e02b8f0fbfc40.zip | |
Merge commit 'release-3.0.7-RC2'
Diffstat (limited to 'phpBB/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 7 |
1 files changed, 7 insertions, 0 deletions
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) { |