diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-04-01 21:27:19 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-04-01 21:27:19 +0200 |
| commit | a2545d1203f694c3096d1e70e507243061dd95e7 (patch) | |
| tree | f60f369b7e1d69be05d710561b3131d397abfb1b | |
| parent | 6d9d2b6be681b6676067bf7e2ec9f58c2aa617ae (diff) | |
| parent | 2b696cc632b917c4d49330966ddb1dee639a22fe (diff) | |
| download | forums-a2545d1203f694c3096d1e70e507243061dd95e7.tar forums-a2545d1203f694c3096d1e70e507243061dd95e7.tar.gz forums-a2545d1203f694c3096d1e70e507243061dd95e7.tar.bz2 forums-a2545d1203f694c3096d1e70e507243061dd95e7.tar.xz forums-a2545d1203f694c3096d1e70e507243061dd95e7.zip | |
Merge branch 'bug/bantu/9108' into develop-olympus
* bug/bantu/9108:
[bug/9108] Fix table binding issues with PostgreSQL in board-wide feed. (Old Bug #58425)
Conflicts:
phpBB/docs/CHANGELOG.html
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/feed.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index a471ae0cf6..ba79660646 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -108,6 +108,7 @@ <li>[Fix] Redirect search engines that access pages with SIDs in the URL. (Bug #58025)</li> <li>[Fix] Fix incorrect ampersand encoding in redirect parameter. (Bug #58465)</li> <li>[Fix] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135)</li> + <li>[Fix] Fix table binding issues with PostgreSQL in board-wide feed. (Bug #58425)</li> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li> <li>[Feature] The memcache acm plugin now supports multiple memcache servers.</li> </ul> diff --git a/phpBB/feed.php b/phpBB/feed.php index a42aa42a7f..4ce983a967 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -783,8 +783,8 @@ class phpbb_feed_overall extends phpbb_feed_post_base 'p.post_id, p.topic_id, p.post_time, p.post_subject, p.post_text, p.bbcode_bitfield, p.bbcode_uid, p.enable_bbcode, p.enable_smilies, p.enable_magic_url, ' . 'u.username, u.user_id', 'FROM' => array( - POSTS_TABLE => 'p', USERS_TABLE => 'u', + POSTS_TABLE => 'p', ), 'LEFT_JOIN' => array( array( |