From 4f0db631d91f050c0baf0f6090026b76532b8072 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Tue, 24 Nov 2009 18:26:15 +0000 Subject: [PATCH] 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 --- phpBB/docs/CHANGELOG.html | 1 + phpBB/feed.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 @@
  • [Fix] Correctly reset login keys if passed value is the current user. (Bug #54125)
  • [Fix] Correctly set last modified headers. (Bug #54245, thanks Paul.J.Murphy)
  • [Fix] Show correct HTML title when reporting private messages. (Bug #54375)
    • +
  • [Fix] Correctly exclude subforums from ATOM Feeds. (Bug #54285)
  • [Change] Send time of last item instead of current time in ATOM Feeds. (Bug #53305)
  • [Change] Use em dash instead of hyphen/minus as separator in ATOM Feeds item statistics. (Bug #53565)
    • 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