only handling non-ajax requests in exception handler at the moment. r…

…efs #1789
zikula · Dec 6, 2014 · bbcdebc · bbcdebc
1 parent 8a7185a
commit bbcdebc
Showing 1 changed file with 15 additions and 13 deletions.
diff --git a/src/lib/Zikula/Bundle/CoreBundle/EventListener/ExceptionListener.php b/src/lib/Zikula/Bundle/CoreBundle/EventListener/ExceptionListener.php
@@ -60,21 +60,23 @@ public function onKernelException(GetResponseForExceptionEvent $event)
         // for BC only, remove in 2.0.0
         $this->handleLegacyExceptionEvent($event);
 
-        $exception = $event->getException();
-        $userLoggedIn = UserUtil::isLoggedIn();
-        do {
-            if ($exception instanceof AccessDeniedException) {
-                $this->handleAccessDeniedException($event, $userLoggedIn);
-            } elseif ($exception instanceof RouteNotFoundException) {
-                if ($userLoggedIn) {
-                    $this->handleRouteNotFoundException($event);
+        if (!$event->getRequest()->isXmlHttpRequest()) {
+            $exception = $event->getException();
+            $userLoggedIn = UserUtil::isLoggedIn();
+            do {
+                if ($exception instanceof AccessDeniedException) {
+                    $this->handleAccessDeniedException($event, $userLoggedIn);
+                } elseif ($exception instanceof RouteNotFoundException) {
+                    if ($userLoggedIn) {
+                        $this->handleRouteNotFoundException($event);
+                    }
                 }
-            }
-            // list and handle additional exceptions here
-        } while (null !== $exception = $exception->getPrevious());
+                // list and handle additional exceptions here
+            } while (null !== $exception = $exception->getPrevious());
 
-        // force all exception to render in BC theme (remove in 2.0.0)
-        $event->getRequest()->attributes->set('_legacy', true);
+            // force all exception to render in BC theme (remove in 2.0.0)
+            $event->getRequest()->attributes->set('_legacy', true);
+        }
     }
 
     /**