mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 04:24:56 +02:00
Code Issues Releases Wiki Activity

Merge branch 'prep-release-3.1.7' into 3.1.x

Browse Source 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
This commit is contained in:
Joas Schilling 2016-01-09 18:42:07 +01:00
commit fd5e66cbf1
5 changed files with 51 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build.xml
View File

@ -3,8 +3,8 @@
<project name="phpBB" description="The phpBB forum software" default="all" basedir="../"> <project name="phpBB" description="The phpBB forum software" default="all" basedir="../">
<!-- a few settings for the build --> <!-- a few settings for the build -->
<property name="newversion" value="3.1.8-dev" /> <property name="newversion" value="3.1.8-dev" />
<property name="prevversion" value="3.1.7" /> <property name="prevversion" value="3.1.7-pl1" />
<property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6" /> <property name="olderversions" value="3.0.14, 3.1.0, 3.1.1, 3.1.2, 3.1.3, 3.1.4, 3.1.5, 3.1.6, 3.1.7-RC1, 3.1.7" />
<!-- no configuration should be needed beyond this point --> <!-- no configuration should be needed beyond this point -->
<property name="oldversions" value="${olderversions}, ${prevversion}" /> <property name="oldversions" value="${olderversions}, ${prevversion}" />

12
phpBB/docs/CHANGELOG.html
View File

@ -49,6 +49,7 @@
<ol> <ol>
<li><a href="#changelog">Changelog</a> <li><a href="#changelog">Changelog</a>
<ul> <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="#v316">Changes since 3.1.6</a></li>
<li><a href="#v315">Changes since 3.1.5</a></li> <li><a href="#v315">Changes since 3.1.5</a></li>
<li><a href="#v314">Changes since 3.1.4</a></li> <li><a href="#v314">Changes since 3.1.4</a></li>
@ -114,6 +115,17 @@
<div class="content"> <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> <a name="v316"></a><h3>Changes since 3.1.6</h3>
<h4>Bug</h4> <h4>Bug</h4>

6
phpBB/includes/acp/acp_bbcodes.php
View File

@ -33,6 +33,7 @@ class acp_bbcodes
// Set up general vars // Set up general vars
$action = request_var('action', ''); $action = request_var('action', '');
$bbcode_id = request_var('bbcode', 0); $bbcode_id = request_var('bbcode', 0);
$submit = $request->is_set_post('submit');
$this->tpl_name = 'acp_bbcodes'; $this->tpl_name = 'acp_bbcodes';
$this->page_title = 'ACP_BBCODES'; $this->page_title = 'ACP_BBCODES';
@ -40,6 +41,11 @@ class acp_bbcodes
add_form_key($form_key); add_form_key($form_key);
if ($submit && !check_form_key($form_key))
{
trigger_error($user->lang['FORM_INVALID'] . adm_back_link($this->u_action), E_USER_WARNING);
}
// Set up mode-specific vars // Set up mode-specific vars
switch ($action) switch ($action)
{ {

2
phpBB/includes/acp/acp_extensions.php
View File

@ -121,8 +121,6 @@ class acp_extensions
'U_ACTION' => $this->u_action, 'U_ACTION' => $this->u_action,
)); ));
add_form_key('version_check_settings');
$this->tpl_name = 'acp_ext_list'; $this->tpl_name = 'acp_ext_list';
break; break;

31
phpBB/phpbb/db/migration/data/v31x/v317pl1.php Normal file
View File

@ -0,0 +1,31 @@
<?php
/**
*
* This file is part of the phpBB Forum Software package.
*
* @copyright (c) phpBB Limited <https://www.phpbb.com>
* @license GNU General Public License, version 2 (GPL-2.0)
*
* For full copyright and license information, please see
* the docs/CREDITS.txt file.
*
*/
namespace phpbb\db\migration\data\v31x;
class v317pl1 extends \phpbb\db\migration\migration
{
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v31x\v317',
);
}
public function update_data()
{
return array(
array('config.update', array('version', '3.1.7-pl1')),
);
}
}