diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-04-04 15:17:48 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-04-04 15:17:48 +0200 |
| commit | f07c9fab2bb8eb92d575e1a63d4f301e880dc80b (patch) | |
| tree | 595e0a9b0f30ca1d4a1b63fb9ff6c7a3324386d3 | |
| parent | fa9510be23e76b8729e2ea16fc0e8403c7a3643c (diff) | |
| parent | 0d4daeb615ed35dc4ded54dd2034df6317837a77 (diff) | |
| download | forums-f07c9fab2bb8eb92d575e1a63d4f301e880dc80b.tar forums-f07c9fab2bb8eb92d575e1a63d4f301e880dc80b.tar.gz forums-f07c9fab2bb8eb92d575e1a63d4f301e880dc80b.tar.bz2 forums-f07c9fab2bb8eb92d575e1a63d4f301e880dc80b.tar.xz forums-f07c9fab2bb8eb92d575e1a63d4f301e880dc80b.zip | |
Merge branch 'bug/nickvergessen/58695' into develop-olympus
* 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
| -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 ba79660646..be8d9f745a 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -109,6 +109,7 @@ <li>[Fix] Fix incorrect ampersand encoding in redirect parameter. (Bug #58465)</li> <li>[Fix] Fix open_basedir issues when accessing styles- and language-management. (Bug #59135)</li> <li>[Fix] Fix table binding issues with PostgreSQL in board-wide feed. (Bug #58425)</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> <li>[Feature] The memcache acm plugin now supports multiple memcache servers.</li> </ul> diff --git a/phpBB/feed.php b/phpBB/feed.php index 4ce983a967..4e286ca9b9 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, $this->get_moderator_approve_forums()); if (empty($in_fid_ary)) { |