diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2010-03-08 00:02:46 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2010-04-03 12:55:31 +0200 |
| commit | 8d0c0dcbcd890871f5b057afb8abb7fce0465b2f (patch) | |
| tree | 4fe056dcd4b2bd903ecef22c8bae7ae3a4c4e760 | |
| parent | 23141a2c519a62161a21196a8b045218f8717bd4 (diff) | |
| download | forums-8d0c0dcbcd890871f5b057afb8abb7fce0465b2f.tar forums-8d0c0dcbcd890871f5b057afb8abb7fce0465b2f.tar.gz forums-8d0c0dcbcd890871f5b057afb8abb7fce0465b2f.tar.bz2 forums-8d0c0dcbcd890871f5b057afb8abb7fce0465b2f.tar.xz forums-8d0c0dcbcd890871f5b057afb8abb7fce0465b2f.zip | |
[bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | 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 @@ <li>[Fix] Allow multibyte keys in request_var(). (Bug #51555)</li> <li>[Fix] Prevent wrong tar archive type detection. (Bug #12531)</li> <li>[Fix] Correct redirection after login to forum not in web root (Bug #58755)</li> + <li>[Fix] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)</li> <li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li> </ul> 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)) { |