makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Marc Alexander 2016-10-12 21:40:59 +02:00
commit 1dd0ceabf6
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
5 changed files with 44 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/build.xml
View file

@ -2,7 +2,7 @@
<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.11-dev" /> <property name="newversion" value="3.1.10" />
<property name="prevversion" value="3.1.9" /> <property name="prevversion" value="3.1.9" />
<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, 3.1.7-pl1, 3.1.8" /> <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, 3.1.7-pl1, 3.1.8" />
<!-- no configuration should be needed beyond this point --> <!-- no configuration should be needed beyond this point -->

2
phpBB/includes/constants.php
View file

@ -28,7 +28,7 @@ if (!defined('IN_PHPBB'))
*/ */
// phpBB Version // phpBB Version
define('PHPBB_VERSION', '3.1.11-dev'); define('PHPBB_VERSION', '3.1.10');
// QA-related // QA-related
// define('PHPBB_QA', 1); // define('PHPBB_QA', 1);

2
phpBB/install/schemas/schema_data.sql
View file

@ -273,7 +273,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('use_system_cron', '0');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.11-dev'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.1.10');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400'); INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');

36
phpBB/phpbb/db/migration/data/v31x/v3110.php Normal file
View file

@ -0,0 +1,36 @@
<?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 v3110 extends \phpbb\db\migration\migration
{
public function effectively_installed()
{
return phpbb_version_compare($this->config['version'], '3.1.10', '>=');
}
static public function depends_on()
{
return array(
'\phpbb\db\migration\data\v31x\v3110rc1',
);
}
public function update_data()
{
return array(
array('config.update', array('version', '3.1.10')),
);
}
}

5
phpBB/phpbb/event/kernel_exception_subscriber.php
View file

@ -34,6 +34,9 @@ class kernel_exception_subscriber implements EventSubscriberInterface
*/ */
protected $user; protected $user;
/** @var \phpbb\request\type_cast_helper */
protected $type_caster;
/** /**
* Construct method * Construct method
* *
@ -44,6 +47,7 @@ class kernel_exception_subscriber implements EventSubscriberInterface
{ {
$this->template = $template; $this->template = $template;
$this->user = $user; $this->user = $user;
$this->type_caster = new \phpbb\request\type_cast_helper();
} }
/** /**
@ -57,6 +61,7 @@ class kernel_exception_subscriber implements EventSubscriberInterface
$exception = $event->getException(); $exception = $event->getException();
$message = $exception->getMessage(); $message = $exception->getMessage();
$this->type_caster->set_var($message, $message, 'string', false, false);
if ($exception instanceof \phpbb\exception\exception_interface) if ($exception instanceof \phpbb\exception\exception_interface)
{ {