From 8d0c0dcbcd890871f5b057afb8abb7fce0465b2f Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 8 Mar 2010 00:02:46 +0100 Subject: [PATCH 1/2] [bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695) --- phpBB/docs/CHANGELOG.html | 1 + phpBB/feed.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 7b8d8f63f2..e3b20acad2 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -103,6 +103,7 @@
  • [Fix] Allow multibyte keys in request_var(). (Bug #51555)
  • [Fix] Prevent wrong tar archive type detection. (Bug #12531)
  • [Fix] Correct redirection after login to forum not in web root (Bug #58755)
    • +
  • [Fix] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)
  • [Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)
    • diff --git a/phpBB/feed.php b/phpBB/feed.php index a42aa42a7f..e0365462a0 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -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, array_keys($auth->acl_getf('m_approve', true))); if (empty($in_fid_ary)) { From 0d4daeb615ed35dc4ded54dd2034df6317837a77 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 8 Mar 2010 11:56:20 +0100 Subject: [PATCH 2/2] [bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint --- phpBB/feed.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/phpBB/feed.php b/phpBB/feed.php index e0365462a0..d52d3e6c8b 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -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', true))); + $in_fid_ary = array_intersect($in_fid_ary, $this->get_moderator_approve_forums()); if (empty($in_fid_ary)) {