Tweak order

Fixes #227
barryvdh · Nov 18, 2014 · c730037 · c730037
1 parent 3759f08
commit c730037
Showing 1 changed file with 10 additions and 14 deletions.
diff --git a/src/LaravelDebugBar.php b/src/LaravelDebugBar.php
@@ -514,33 +514,29 @@ public function modifyResponse($request, $response)
             }
         }
 
-        if ($response->isRedirection()) {
+        if ($response->isRedirection() || !($request instanceof \Illuminate\Http\Request)) {
             try {
                 $this->stackData();
             } catch (\Exception $e) {
                 $app['log']->error('Debugbar exception: ' . $e->getMessage());
             }
         } elseif (
-            !($request instanceof \Illuminate\Http\Request)
-            || ($response->headers->has('Content-Type') && false === strpos(
-                    $response->headers->get('Content-Type'),
-                    'html'
-                ))
-            || 'html' !== $request->format()
+            ($request->isXmlHttpRequest() || $request->wantsJson()) and
+            $app['config']->get('laravel-debugbar::config.capture_ajax', true)
         ) {
             try {
-                // Just collect + store data, don't inject it.
-                $this->collect();
+                $this->sendDataInHeaders(true);
             } catch (\Exception $e) {
                 $app['log']->error('Debugbar exception: ' . $e->getMessage());
             }
-        } elseif (($request->isXmlHttpRequest() || $request->wantsJson()) and $app['config']->get(
-                'laravel-debugbar::config.capture_ajax',
-                true
-            )
+        } elseif (
+            ($response->headers->has('Content-Type') and
+            strpos($response->headers->get('Content-Type'), 'html') === false)
+            || 'html' !== $request->format()
         ) {
             try {
-                $this->sendDataInHeaders(true);
+                // Just collect + store data, don't inject it.
+                $this->collect();
             } catch (\Exception $e) {
                 $app['log']->error('Debugbar exception: ' . $e->getMessage());
             }