aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/docs
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2016-01-09 18:42:07 +0100
committerJoas Schilling <nickvergessen@gmx.de>2016-01-09 18:42:07 +0100
commitfd5e66cbf11ac3e49007369ece339bc937517d93 (patch)
treeb625c33c00c30ce65d72c79f9b3fc68f5c8f038a /phpBB/docs
parentd64680983a5fa06a737a1ae7e164cb7f67a5a53c (diff)
parent85e98a9d702cf179dc09a6ad077fac23bb28ae38 (diff)
downloadforums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar
forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.gz
forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.bz2
forums-fd5e66cbf11ac3e49007369ece339bc937517d93.tar.xz
forums-fd5e66cbf11ac3e49007369ece339bc937517d93.zip
Merge branch 'prep-release-3.1.7' into 3.1.x
Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql
Diffstat (limited to 'phpBB/docs')
-rw-r--r--phpBB/docs/CHANGELOG.html12
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index a59ea31509..97998e7d00 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -49,6 +49,7 @@
<ol>
<li><a href="#changelog">Changelog</a>
<ul>
+ <li><a href="#v317">Changes since 3.1.7</a></li>
<li><a href="#v316">Changes since 3.1.6</a></li>
<li><a href="#v315">Changes since 3.1.5</a></li>
<li><a href="#v314">Changes since 3.1.4</a></li>
@@ -114,6 +115,17 @@
<div class="content">
+ <a name="v317"></a><h3>Changes since 3.1.7</h3>
+
+ <h4>Security Issue</h4>
+ <ul>
+ <li>[SECURITY-188] - Check form key in acp_bbcodes</li>
+ </ul>
+ <h4>Bug</h4>
+ <ul>
+ <li>[<a href="https://tracker.phpbb.com/browse/PHPBB3-14343">PHPBB3-14343</a>] - Undefined variable $phpbb_dispatcher when (un-)locking a topic or post</li>
+ </ul>
+
<a name="v316"></a><h3>Changes since 3.1.6</h3>
<h4>Bug</h4>