mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x'

Browse Source 
Conflicts:
	build/build.xml
	phpBB/docs/CHANGELOG.html
	phpBB/includes/acp/acp_bbcodes.php
This commit is contained in:
Joas Schilling
2016-01-09 18:45:32 +01:00
parent b2324607ad fd5e66cbf1
commit 7f7b09fdeb
5 changed files with 50 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
phpBB/docs/CHANGELOG.html
View File

@@ -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>