aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2010-03-05 20:56:45 +0100
committerNils Adermann <naderman@naderman.de>2010-03-05 20:56:45 +0100
commit07fd27053040b1e3cd5a36f5d53b529caa3f695e (patch)
treebe10742ac169f7dcb35ceb05bdadf0623a050ab0
parentac329275662f737f03f485107cb69412739c1afa (diff)
parentf0a82396d48829a623ca716dc8c7d95e6aed2941 (diff)
downloadforums-07fd27053040b1e3cd5a36f5d53b529caa3f695e.tar
forums-07fd27053040b1e3cd5a36f5d53b529caa3f695e.tar.gz
forums-07fd27053040b1e3cd5a36f5d53b529caa3f695e.tar.bz2
forums-07fd27053040b1e3cd5a36f5d53b529caa3f695e.tar.xz
forums-07fd27053040b1e3cd5a36f5d53b529caa3f695e.zip
Merge branch 'bug/bantu/58595' into develop-olympus
-rw-r--r--phpBB/docs/CHANGELOG.html9
-rw-r--r--phpBB/feed.php2
2 files changed, 9 insertions, 2 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index 3042027e83..0897328949 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -53,6 +53,7 @@
<ol>
<li><a href="#changelog">Changelog</a>
<ol style="list-style-type: lower-roman;">
+ <li><a href="#v307">Changes since 3.0.7-PL1</a></li>
<li><a href="#v307">Changes since 3.0.7</a></li>
<li><a href="#v306">Changes since 3.0.6</a></li>
<li><a href="#v305">Changes since 3.0.5</a></li>
@@ -88,7 +89,7 @@
<div class="content">
- <a name="v307"></a><h3>1.i. Changes since 3.0.7</h3>
+ <a name="v307-pl1"></a><h3>1.i. Changes since 3.0.7-PL1</h3>
<ul>
<li>[Fix] Correctly sort database backup file list by date on database restore page. (Bug #57385)</li>
@@ -102,6 +103,12 @@
<li>[Feature] Support for Microsoft's Native SQL Server Driver for PHP (Bug #57055 - Patch by Chris Pucci at Microsoft)</li>
</ul>
+ <a name="v307"></a><h3>1.i. Changes since 3.0.7</h3>
+
+ <ul>
+ <li>[Sec] Do not expose forum content of forums with ACL entries but no actual permission in ATOM Feeds. (Bug #58595)</li>
+ </ul>
+
<a name="v306"></a><h3>1.ii. Changes since 3.0.6</h3>
<ul>
diff --git a/phpBB/feed.php b/phpBB/feed.php
index 1832efbc61..a42aa42a7f 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -522,7 +522,7 @@ class phpbb_feed_base
if (!isset($forum_ids))
{
- $forum_ids = array_keys($auth->acl_getf('f_read'));
+ $forum_ids = array_keys($auth->acl_getf('f_read', true));
}
return $forum_ids;