diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2009-11-24 18:26:15 +0000 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2009-11-24 18:26:15 +0000 |
| commit | 4f0db631d91f050c0baf0f6090026b76532b8072 (patch) | |
| tree | 90dbf8c8565bae19e345e73df1fd08eba2b93a77 | |
| parent | f864e75174be78eb3ebac2235c8e73738d2065fb (diff) | |
| download | forums-4f0db631d91f050c0baf0f6090026b76532b8072.tar forums-4f0db631d91f050c0baf0f6090026b76532b8072.tar.gz forums-4f0db631d91f050c0baf0f6090026b76532b8072.tar.bz2 forums-4f0db631d91f050c0baf0f6090026b76532b8072.tar.xz forums-4f0db631d91f050c0baf0f6090026b76532b8072.zip | |
Bug #54285 - Correctly exclude subforums from ATOM Feeds.
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10287 89ea8834-ac86-4346-8a33-228a782c2dd0
| -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 79eb8114d3..78f770be23 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -94,6 +94,7 @@ <li>[Fix] Correctly reset login keys if passed value is the current user. (Bug #54125)</li> <li>[Fix] Correctly set last modified headers. (Bug #54245, thanks Paul.J.Murphy)</li> <li>[Fix] Show correct HTML title when reporting private messages. (Bug #54375)</li> + <li>[Fix] Correctly exclude subforums from ATOM Feeds. (Bug #54285)</li> <li>[Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)</li> <li>[Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)</li> </ul> diff --git a/phpBB/feed.php b/phpBB/feed.php index 5668d297ad..a3f194ea33 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -644,7 +644,7 @@ class phpbb_feed } // Determine which forums to fetch - $not_in_fid = (sizeof($this->excluded_forums())) ? ' AND ' . $db->sql_in_set('f1.forum_id', $this->excluded_forums(), true) : ''; + $not_in_fid = (sizeof($this->excluded_forums())) ? ' AND ' . $db->sql_in_set('f2.forum_id', $this->excluded_forums(), true) : ''; // Determine forum childs... $sql = 'SELECT f2.forum_id |