diff options
| author | Chris Smith <toonarmy@phpbb.com> | 2010-02-20 00:02:56 +0000 |
|---|---|---|
| committer | Chris Smith <toonarmy@phpbb.com> | 2010-02-20 00:02:56 +0000 |
| commit | 14b5aab07feda92f405adc699499438e40e3f371 (patch) | |
| tree | 15e24ab86b328dc69235b7c9400d99d2bfcb22a9 /phpBB | |
| parent | d49806a04356c1aa51e4a45911df850f4318b6a5 (diff) | |
| download | forums-14b5aab07feda92f405adc699499438e40e3f371.tar forums-14b5aab07feda92f405adc699499438e40e3f371.tar.gz forums-14b5aab07feda92f405adc699499438e40e3f371.tar.bz2 forums-14b5aab07feda92f405adc699499438e40e3f371.tar.xz forums-14b5aab07feda92f405adc699499438e40e3f371.zip | |
Firebird based board can now access their global announcements, took a while to discover this one. #57525
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10509 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/viewtopic.php | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index eb8d65a4ef..7a2c551af7 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -173,6 +173,7 @@ <li>[Fix] Restrict search for language/../iso.txt to folders. (Bug #57795)</li> <li>[Fix] Make user_email_hash() function independent from system's architecture. (Bug #57755)</li> <li>[Fix] Correct behavior of "force_approved_state" when value is false. (Bug #57715)</li> + <li>[Fix] Global announcements could not be accessed on a board using Firebird as the database server. (Bug #57525)</li> <li>[Change] Move redirect into a hidden field to avoid issues with mod_security. (Bug #54145)</li> <li>[Change] Log activation through inactive users ACP. (Bug #30145)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> 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) { |