aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2016-11-26 16:41:31 +0100
committerMarc Alexander <admin@m-a-styles.de>2016-11-26 16:41:31 +0100
commit9432662c372df946fa9d5b810a5d4bd9896acc84 (patch)
tree51cf7f53258b76212de322ed0ab8e01354d6da43
parent145ba85d981f6bb3b6ebba74bcefb879da62d932 (diff)
parent997bdc7778f5c967b2acb8479ee1c0dfe909d5b8 (diff)
downloadforums-9432662c372df946fa9d5b810a5d4bd9896acc84.tar
forums-9432662c372df946fa9d5b810a5d4bd9896acc84.tar.gz
forums-9432662c372df946fa9d5b810a5d4bd9896acc84.tar.bz2
forums-9432662c372df946fa9d5b810a5d4bd9896acc84.tar.xz
forums-9432662c372df946fa9d5b810a5d4bd9896acc84.zip
Merge branch '3.1.x' into 3.2.x
-rw-r--r--phpBB/phpbb/event/kernel_exception_subscriber.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php
index 3c7375dadf..b7a54f2608 100644
--- a/phpBB/phpbb/event/kernel_exception_subscriber.php
+++ b/phpBB/phpbb/event/kernel_exception_subscriber.php
@@ -63,7 +63,7 @@ class kernel_exception_subscriber implements EventSubscriberInterface
$exception = $event->getException();
$message = $exception->getMessage();
- $this->type_caster->set_var($message, $message, 'string', false, false);
+ $this->type_caster->set_var($message, $message, 'string', true, false);
if ($exception instanceof \phpbb\exception\exception_interface)
{