mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.1.x' into 3.2.x

Browse Source
This commit is contained in:
Marc Alexander
2016-10-12 21:43:35 +02:00
parent 322b86da1f 1dd0ceabf6
commit 84a8cf00ad
3 changed files with 42 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,6 +36,9 @@ class kernel_exception_subscriber implements EventSubscriberInterface
*/
protected $language;
/** @var \phpbb\request\type_cast_helper */
protected $type_caster;
/**
* Construct method
*
@@ -46,6 +49,7 @@ class kernel_exception_subscriber implements EventSubscriberInterface
{
$this->template = $template;
$this->language = $language;
$this->type_caster = new \phpbb\request\type_cast_helper();
}
/**
@@ -59,6 +63,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)
{