Only add server timing on ajax, when enabled

sicaboy · Mar 31, 2017 · 41df91e · 41df91e
1 parent 6b2f13f
commit 41df91e
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -648,6 +648,11 @@ public function modifyResponse(Request $request, Response $response)
         ) {
             try {
                 $this->sendDataInHeaders(true);
+
+                if ($app['config']->get('debugbar.add_ajax_timing', false)) {
+                    $this->addServerTimingHeaders($response);
+                }
+
             } catch (\Exception $e) {
                 $app['log']->error('Debugbar exception: ' . $e->getMessage());
             }
@@ -670,7 +675,7 @@ public function modifyResponse(Request $request, Response $response)
             }
         }
 
-        $this->addServerTimingHeaders($response);
+
 
         return $response;
     }
@@ -979,6 +984,7 @@ protected function addServerTimingHeaders(Response $response)
         if ($this->hasCollector('time')) {
             $collector = $this->getCollector('time');
 
+            $headers = [];
             foreach ($collector->collect()['measures'] as $k => $m) {
                 $headers[] = sprintf('%d=%F; "%s"', $k, $m['duration'], str_replace('"', "'", $m['label']));
             }