diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2016-01-09 18:45:32 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2016-01-09 18:45:32 +0100 |
| commit | 7f7b09fdeb087ed826bf5216fa271f2dd65c52e6 (patch) | |
| tree | 63a747494d59ce4dd2fbfb4742f2f90ac9b3790f /phpBB/docs/CHANGELOG.html | |
| parent | b2324607ad7d23450aafddbf6fb286fa05e3a9d5 (diff) | |
| parent | fd5e66cbf11ac3e49007369ece339bc937517d93 (diff) | |
| download | forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.gz forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.bz2 forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.tar.xz forums-7f7b09fdeb087ed826bf5216fa271f2dd65c52e6.zip | |
Merge branch '3.1.x'
Conflicts:
build/build.xml
phpBB/docs/CHANGELOG.html
phpBB/includes/acp/acp_bbcodes.php
Diffstat (limited to 'phpBB/docs/CHANGELOG.html')
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 4311ebfe63..b77af13d08 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -51,6 +51,7 @@ <ul> <li><a href="#v320a1">Changes since 3.2.0-a1</a></li> <li><a href="#v31x">Changes since 3.1.x</a></li> + <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> @@ -388,6 +389,17 @@ <li>[<a href="http://tracker.phpbb.com/browse/PHPBB3-14265">PHPBB3-14265</a>] - Make all tables available in the container</li> </ul> + <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> |