diff options
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/acp_users_overview.html | 2 | ||||
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 2 | ||||
| -rw-r--r-- | phpBB/feed.php | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/adm/style/acp_users_overview.html b/phpBB/adm/style/acp_users_overview.html index d48cfa57be..7d9a0f27d3 100644 --- a/phpBB/adm/style/acp_users_overview.html +++ b/phpBB/adm/style/acp_users_overview.html @@ -148,6 +148,6 @@ {S_FORM_TOKEN} </p> </fieldset> - <!-- ENDIF --> </form> + <!-- ENDIF --> <!-- ENDIF --> diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4be97e3860..93a2bb0fd6 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -109,6 +109,8 @@ <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>[Fix] Various XHTML mistakes in ACP (Bug #58745)</li> <li>[Fix] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)</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> 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)) { |