makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/13361] Support ajax request (send a json response)

Browse source 
PHPBB3-13361
This commit is contained in:
Tristan Darricau 2015-01-10 17:14:14 +01:00
parent b00d02496e
commit 74e8f9bd4e
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
phpBB/phpbb/event/kernel_exception_subscriber.php
View file

@ -14,6 +14,7 @@
namespace phpbb\event; namespace phpbb\event;
use Symfony\Component\EventDispatcher\EventSubscriberInterface; use Symfony\Component\EventDispatcher\EventSubscriberInterface;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface; use Symfony\Component\HttpKernel\Exception\HttpExceptionInterface;
use Symfony\Component\HttpKernel\KernelEvents; use Symfony\Component\HttpKernel\KernelEvents;
use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent; use Symfony\Component\HttpKernel\Event\GetResponseForExceptionEvent;
@ -64,18 +65,33 @@ class kernel_exception_subscriber implements EventSubscriberInterface
$message = call_user_func_array(array($this->user, 'lang'), array_merge(array($message), $exception->get_parameters())); $message = call_user_func_array(array($this->user, 'lang'), array_merge(array($message), $exception->get_parameters()));
} }
$this->template->assign_vars(array( if (!$event->getRequest()->isXmlHttpRequest())
'MESSAGE_TITLE' => $this->user->lang('INFORMATION'), {
'MESSAGE_TEXT' => $message, $this->template->assign_vars(array(
)); 'MESSAGE_TITLE' => $this->user->lang('INFORMATION'),
'MESSAGE_TEXT' => $message,
));
$this->template->set_filenames(array( $this->template->set_filenames(array(
'body' => 'message_body.html', 'body' => 'message_body.html',
)); ));
page_footer(true, false, false); page_footer(true, false, false);
$response = new Response($this->template->assign_display('body'), 500); $response = new Response($this->template->assign_display('body'), 500);
}
else
{
$data = array();
$data['message'] = $message;
if (defined('DEBUG'))
{
$data['trace'] = $exception->getTrace();
}
$response = new JsonResponse($message, 500);
}
if ($exception instanceof HttpExceptionInterface) if ($exception instanceof HttpExceptionInterface)
{ {