diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-12-20 15:18:32 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-12-20 15:18:32 +0000 |
| commit | 773f3727de943e8c38c9dc0621b98dc52a3355c6 (patch) | |
| tree | 267d9b5dad34ea7f060562eb9c29df74c449b84a /phpBB/feed.php | |
| parent | 2f0d9f7d3d3d85f825b4e117d59b89a820e82fe6 (diff) | |
| download | forums-773f3727de943e8c38c9dc0621b98dc52a3355c6.tar forums-773f3727de943e8c38c9dc0621b98dc52a3355c6.tar.gz forums-773f3727de943e8c38c9dc0621b98dc52a3355c6.tar.bz2 forums-773f3727de943e8c38c9dc0621b98dc52a3355c6.tar.xz forums-773f3727de943e8c38c9dc0621b98dc52a3355c6.zip | |
Let forums feed use the new methods.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10356 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index 2474db0e13..006790d7d7 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -1015,8 +1015,8 @@ class phpbb_feed_forums extends phpbb_feed_base { global $auth, $db; - $f_read_ids = array_keys($auth->acl_getf('f_read')); - if (empty($f_read_ids)) + $in_fid_ary = array_diff($this->get_readable_forums(), $this->get_excluded_forums()); + if (empty($in_fid_ary)) { return false; } @@ -1028,8 +1028,7 @@ class phpbb_feed_forums extends phpbb_feed_base f.forum_topics, f.forum_posts', 'FROM' => array(FORUMS_TABLE => 'f'), 'WHERE' => 'f.forum_type = ' . FORUM_POST . ' - AND ' . $db->sql_bit_and('f.forum_options', FORUM_OPTION_FEED_EXCLUDE, '= 0') . ' - AND ' . $db->sql_in_set('f.forum_id', $f_read_ids), + AND ' . $db->sql_in_set('f.forum_id', $in_fid_ary), 'ORDER_BY' => 'f.left_id ASC', ); |