makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages 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
commit 84a8cf00ad
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
3 changed files with 42 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/build.xml
View file

@ -4,7 +4,7 @@
<!-- a few settings for the build --> <!-- a few settings for the build -->
<property name="newversion" value="3.2.0-RC2-dev" /> <property name="newversion" value="3.2.0-RC2-dev" />
<property name="prevversion" value="3.2.0-b2" /> <property name="prevversion" value="3.2.0-b2" />
<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, 3.1.9, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1" /> <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, 3.1.9, 3.1.10, 3.2.0-a1, 3.2.0-a2, 3.2.0-b1" />
<!-- 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}" />

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