5 files changed, 99 insertions, 21 deletions
diff --git a/phpBB/phpbb/event/dispatcher.php b/phpBB/phpbb/event/dispatcher.php
index 9a786022c2..1c4abeb108 100644
--- a/phpBB/phpbb/event/dispatcher.php
+++ b/phpBB/phpbb/event/dispatcher.php
@@ -14,6 +14,7 @@
 namespace phpbb\event;
 
 use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
+use Symfony\Component\EventDispatcher\Event;
 
 /**
 * Extension of the Symfony2 EventDispatcher
@@ -32,6 +33,11 @@ use Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher;
 class dispatcher extends ContainerAwareEventDispatcher implements dispatcher_interface
 {
 	/**
+	 * @var bool
+	 */
+	protected $disabled = false;
+
+	/**
 	* {@inheritdoc}
 	*/
 	public function trigger_event($eventName, $data = array())
@@ -40,4 +46,33 @@ class dispatcher extends ContainerAwareEventDispatcher implements dispatcher_int
 		$this->dispatch($eventName, $event);
 		return $event->get_data_filtered(array_keys($data));
 	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function dispatch($eventName, Event $event = null)
+	{
+		if ($this->disabled)
+		{
+			return $event;
+		}
+
+		return parent::dispatch($eventName, $event);
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function disable()
+	{
+		$this->disabled = true;
+	}
+
+	/**
+	 * {@inheritdoc}
+	 */
+	public function enable()
+	{
+		$this->disabled = false;
+	}
 }
diff --git a/phpBB/phpbb/event/dispatcher_interface.php b/phpBB/phpbb/event/dispatcher_interface.php
index 50a3ef9101..c66aa98260 100644
--- a/phpBB/phpbb/event/dispatcher_interface.php
+++ b/phpBB/phpbb/event/dispatcher_interface.php
@@ -37,4 +37,14 @@ interface dispatcher_interface extends \Symfony\Component\EventDispatcher\EventD
 	* @return mixed
 	*/
 	public function trigger_event($eventName, $data = array());
+
+	/**
+	 * Disable the event dispatcher.
+	 */
+	public function disable();
+
+	/**
+	 * Enable the event dispatcher.
+	 */
+	public function enable();
 }
diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php
index 44e87507f9..eb7831ad34 100644
--- a/phpBB/phpbb/event/kernel_exception_subscriber.php
+++ b/phpBB/phpbb/event/kernel_exception_subscriber.php
@@ -14,9 +14,10 @@
 namespace phpbb\event;
 
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
 use Symfony\Component\HttpKernel\KernelEvents;
 use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
-use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpFoundation\Response;
 
 class kernel_exception_subscriber implements EventSubscriberInterface
@@ -53,23 +54,55 @@ class kernel_exception_subscriber implements EventSubscriberInterface
 	*/
 	public function on_kernel_exception(GetResponseForExceptionEvent $event)
 	{
-		page_header($this->user->lang('INFORMATION'));
-
 		$exception = $event->getException();
 
-		$this->template->assign_vars(array(
-			'MESSAGE_TITLE'		=> $this->user->lang('INFORMATION'),
-			'MESSAGE_TEXT'		=> $exception->getMessage(),
-		));
+		$message = $exception->getMessage();
+
+		if ($exception instanceof \phpbb\exception\exception_interface)
+		{
+			$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($message), $exception->get_parameters()));
+		}
+
+		if (!$event->getRequest()->isXmlHttpRequest())
+		{
+			page_header($this->user->lang('INFORMATION'));
+
+			$this->template->assign_vars(array(
+				'MESSAGE_TITLE' => $this->user->lang('INFORMATION'),
+				'MESSAGE_TEXT'  => $message,
+			));
+
+			$this->template->set_filenames(array(
+				'body' => 'message_body.html',
+			));
+
+			page_footer(true, false, false);
+
+			$response = new Response($this->template->assign_display('body'), 500);
+		}
+		else
+		{
+			$data = array();
+
+			if (!empty($message))
+			{
+				$data['message'] = $message;
+			}
+
+			if (defined('DEBUG'))
+			{
+				$data['trace'] = $exception->getTrace();
+			}
 
-		$this->template->set_filenames(array(
-			'body'	=> 'message_body.html',
-		));
+			$response = new JsonResponse($data, 500);
+		}
 
-		page_footer(true, false, false);
+		if ($exception instanceof HttpExceptionInterface)
+		{
+			$response->setStatusCode($exception->getStatusCode());
+			$response->headers->add($exception->getHeaders());
+		}
 
-		$status_code = $exception instanceof HttpException ? $exception->getStatusCode() : 500;
-		$response = new Response($this->template->assign_display('body'), $status_code);
 		$event->setResponse($response);
 	}
 
diff --git a/phpBB/phpbb/event/kernel_terminate_subscriber.php b/phpBB/phpbb/event/kernel_terminate_subscriber.php
index 57e4840380..3a709f73fd 100644
--- a/phpBB/phpbb/event/kernel_terminate_subscriber.php
+++ b/phpBB/phpbb/event/kernel_terminate_subscriber.php
@@ -35,7 +35,7 @@ class kernel_terminate_subscriber implements EventSubscriberInterface
 	public static function getSubscribedEvents()
 	{
 		return array(
-			KernelEvents::TERMINATE		=> 'on_kernel_terminate',
+			KernelEvents::TERMINATE		=> array('on_kernel_terminate', ~PHP_INT_MAX),
 		);
 	}
 }
diff --git a/phpBB/phpbb/event/php_exporter.php b/phpBB/phpbb/event/php_exporter.php
index badbbb48fd..35144eeeec 100644
--- a/phpBB/phpbb/event/php_exporter.php
+++ b/phpBB/phpbb/event/php_exporter.php
@@ -253,7 +253,7 @@ class php_exporter
 	public function get_event_name($event_line, $is_dispatch)
 	{
 		$event_text_line = $this->file_lines[$event_line];
-		$event_text_line = ltrim($event_text_line, "\t");
+		$event_text_line = ltrim($event_text_line, "\t ");
 
 		if ($is_dispatch)
 		{
@@ -389,7 +389,7 @@ class php_exporter
 		$found_comment_end = false;
 		while (ltrim($this->file_lines[$this->current_event_line - $current_doc_line], "\t") !== '/**')
 		{
-			if (ltrim($this->file_lines[$this->current_event_line - $current_doc_line], "\t") === '*/')
+			if (ltrim($this->file_lines[$this->current_event_line - $current_doc_line], "\t ") === '*/')
 			{
 				$found_comment_end = true;
 			}
@@ -471,7 +471,7 @@ class php_exporter
 	{
 		$find_tag_line = 0;
 		$found_comment_end = false;
-		while (strpos(ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t"), '* @' . $find_tag . ' ') !== 0)
+		while (strpos(ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t "), '* @' . $find_tag . ' ') !== 0)
 		{
 			if ($found_comment_end && ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t") === '/**')
 			{
@@ -482,7 +482,7 @@ class php_exporter
 
 			foreach ($disallowed_tags as $disallowed_tag)
 			{
-				if ($found_comment_end && strpos(ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t"), '* @' . $disallowed_tag) === 0)
+				if ($found_comment_end && strpos(ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t "), '* @' . $disallowed_tag) === 0)
 				{
 					// Found @var after the @since
 					throw new \LogicException("Found '@{$disallowed_tag}' information after '@{$find_tag}' for event "
@@ -490,7 +490,7 @@ class php_exporter
 				}
 			}
 
-			if (ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t") === '*/')
+			if (ltrim($this->file_lines[$this->current_event_line - $find_tag_line], "\t ") === '*/')
 			{
 				$found_comment_end = true;
 			}
@@ -550,7 +550,7 @@ class php_exporter
 	public function validate_since($line)
 	{
 		$match = array();
-		preg_match('#^\* @since (\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?)$#', ltrim($line, "\t"), $match);
+		preg_match('#^\* @since (\d+\.\d+\.\d+(?:-(?:a|b|RC|pl)\d+)?)$#', ltrim($line, "\t "), $match);
 		if (!isset($match[1]))
 		{
 			throw new \LogicException("Invalid '@since' information for event "
@@ -570,7 +570,7 @@ class php_exporter
 	*/
 	public function validate_event($event_name, $line)
 	{
-		$event = substr(ltrim($line, "\t"), strlen('* @event '));
+		$event = substr(ltrim($line, "\t "), strlen('* @event '));
 
 		if ($event !== trim($event))
 		{