aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/event/kernel_exception_subscriber.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-10-12 21:40:59 +0200
committerMarc Alexander <admin@m-a-styles.de>2016-10-12 21:40:59 +0200
commit1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31 (patch)
treea0dc5c3f4884c47ba7d3e426400540842b2802bb /phpBB/phpbb/event/kernel_exception_subscriber.php
parent1ad64f89b817a42722b522f4a763424eea3b5a5f (diff)
parent40354f1f909168ffafc332b74af15f9347c4e530 (diff)
downloadforums-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/phpbb/event/kernel_exception_subscriber.php')
-rw-r--r--phpBB/phpbb/event/kernel_exception_subscriber.php5
1 files changed, 5 insertions, 0 deletions
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)
{