diff options
author | Marc Alexander <admin@m-a-styles.de> | 2016-10-12 21:43:35 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2016-10-12 21:43:35 +0200 |
commit | 84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6 (patch) | |
tree | 7fc6c438091fc78fdc9ada32d67719c153befba9 /phpBB/phpbb/event/kernel_exception_subscriber.php | |
parent | 322b86da1f6b497d38fb346d233d64d97a5d2b14 (diff) | |
parent | 1dd0ceabf6e3cdc49ea6a2abe3ad8fcece4cca31 (diff) | |
download | forums-84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6.tar forums-84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6.tar.gz forums-84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6.tar.bz2 forums-84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6.tar.xz forums-84a8cf00ad9e51ae1463b1d02ec11b211b8b1ff6.zip |
Merge branch '3.1.x' into 3.2.x
Diffstat (limited to 'phpBB/phpbb/event/kernel_exception_subscriber.php')
-rw-r--r-- | phpBB/phpbb/event/kernel_exception_subscriber.php | 5 |
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 e427abf5e3..527b863359 100644 --- a/phpBB/phpbb/event/kernel_exception_subscriber.php +++ b/phpBB/phpbb/event/kernel_exception_subscriber.php @@ -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) { |