diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-10-12 21:40:59 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-12 21:40:59 +0200 |
| commit | 1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31 (patch) | |
| tree | a0dc5c3f4884c47ba7d3e426400540842b2802bb /phpBB | |
| parent | 1ad64f89b817a42722b522f4a763424eea3b5a5f (diff) | |
| parent | 40354f1f909168ffafc332b74af15f9347c4e530 (diff) | |
| download | forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar.gz forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar.bz2 forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.tar.xz forums-1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31.zip | |
Merge branch 'prep-release-3.1.10' into 3.1.x
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/constants.php | 2 | ||||
| -rw-r--r-- | phpBB/install/schemas/schema_data.sql | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v31x/v3110.php | 36 | ||||
| -rw-r--r-- | phpBB/phpbb/event/kernel_exception_subscriber.php | 5 |
4 files changed, 43 insertions, 2 deletions
diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php index cafb819ffc..23839e3d9a 100644 --- a/phpBB/includes/constants.php +++ b/phpBB/includes/constants.php @@ -28,7 +28,7 @@ if (!defined('IN_PHPBB')) */ // phpBB Version -define('PHPBB_VERSION', '3.1.11-dev'); +define('PHPBB_VERSION', '3.1.10'); // QA-related // define('PHPBB_QA', 1); diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql index e13b23e4c4..3449829d8c 100644 --- a/phpBB/install/schemas/schema_data.sql +++ b/phpBB/install/schemas/schema_data.sql @@ -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_path', 'files'); 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_gc', '14400'); diff --git a/phpBB/phpbb/db/migration/data/v31x/v3110.php b/phpBB/phpbb/db/migration/data/v31x/v3110.php new file mode 100644 index 0000000000..b89b4cc6e6 --- /dev/null +++ b/phpBB/phpbb/db/migration/data/v31x/v3110.php @@ -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')), + ); + } +} diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php index eb7831ad34..34c8422b0a 100644 --- a/phpBB/phpbb/event/kernel_exception_subscriber.php +++ b/phpBB/phpbb/event/kernel_exception_subscriber.php @@ -34,6 +34,9 @@ class kernel_exception_subscriber implements EventSubscriberInterface */ protected $user; + /** @var \phpbb\request\type_cast_helper */ + protected $type_caster; + /** * Construct method * @@ -44,6 +47,7 @@ class kernel_exception_subscriber implements EventSubscriberInterface { $this->template = $template; $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(); $message = $exception->getMessage(); + $this->type_caster->set_var($message, $message, 'string', false, false); if ($exception instanceof \phpbb\exception\exception_interface) { |