diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-12-11 16:18:56 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-12-11 16:18:56 +0000 |
| commit | afa8dcb42a5a264d1f6e1f7a3f4a5889c3b5aa66 (patch) | |
| tree | fda3b378555e1531abe3fddba568c12744c4eae0 | |
| parent | c207c530b770385f1b8f5003d38ebe87e95f1dba (diff) | |
| download | forums-afa8dcb42a5a264d1f6e1f7a3f4a5889c3b5aa66.tar forums-afa8dcb42a5a264d1f6e1f7a3f4a5889c3b5aa66.tar.gz forums-afa8dcb42a5a264d1f6e1f7a3f4a5889c3b5aa66.tar.bz2 forums-afa8dcb42a5a264d1f6e1f7a3f4a5889c3b5aa66.tar.xz forums-afa8dcb42a5a264d1f6e1f7a3f4a5889c3b5aa66.zip | |
Bug #54345 - Do not deliver topics from unreadable forums in the news feed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10317 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/feed.php | 8 |
2 files changed, 8 insertions, 1 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 55d45965eb..84cfda6595 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -113,6 +113,7 @@ <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> <li>[Change] Cache overall, forums, topics and news feeds for anonymous users and bots.</li> + <li>[Change] Do not deliver topics from unreadable forums in the news feed. (Bug #54345)</li> </ul> <a name="v305"></a><h3>1.ii. Changes since 3.0.5</h3> diff --git a/phpBB/feed.php b/phpBB/feed.php index e644afe642..98e8e61349 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -958,7 +958,7 @@ class phpbb_feed_news extends phpbb_feed_base function get_sql() { - global $db, $config; + global $auth, $config, $db; // Get news forums... $sql = 'SELECT forum_id @@ -969,6 +969,12 @@ class phpbb_feed_news extends phpbb_feed_base $in_fid_ary = array(); while ($row = $db->sql_fetchrow($result)) { + // Make sure we can read this forum + if (!$auth->acl_get('f_read', (int) $row['forum_id'])) + { + continue; + } + $in_fid_ary[] = (int) $row['forum_id']; } $db->sql_freeresult($result); |