makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Let forums feed use the new methods.

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10356 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2009-12-20 15:18:32 +00:00
parent 2f0d9f7d3d
commit 773f3727de
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/feed.php
View file

@ -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',
);