mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 14:00:31 +02:00
Code Issues Releases Wiki Activity

Merge branch 'bug/nickvergessen/58695' into develop-olympus

Browse Source 
* bug/nickvergessen/58695:
  [bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
  [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)

Conflicts:
	phpBB/docs/CHANGELOG.html
This commit is contained in:
Nils Adermann
2010-04-04 15:17:48 +02:00
parent fa9510be23 0d4daeb615
commit f07c9fab2b
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/feed.php
View File

@@ -535,7 +535,7 @@ class phpbb_feed_base
if (!isset($forum_ids))
{
$forum_ids = array_keys($auth->acl_getf('m_approve'));
$forum_ids = array_keys($auth->acl_getf('m_approve', true));
}
return $forum_ids;
@@ -994,7 +994,7 @@ class phpbb_feed_topic extends phpbb_feed_post_base
if (!$this->topic_data['topic_approved'])
{
// Also require m_approve
$in_fid_ary = array_intersect($in_fid_ary, array_keys($auth->acl_getf('m_approve')));
$in_fid_ary = array_intersect($in_fid_ary, $this->get_moderator_approve_forums());
if (empty($in_fid_ary))
{