Merge remote branch 'azogheb/webProfilerOptimization'

fabpot · fabpot · commit 18e56409c6fc · 2011-03-09T21:54:06.000+01:00
* azogheb/webProfilerOptimization:
  [WebProfilerBundle] Optimization to listener
diff --git a/src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php b/src/Symfony/Bundle/WebProfilerBundle/WebDebugToolbarListener.php
@@ -86,13 +86,12 @@ protected function injectToolbar(Response $response)
             $substrFunction = 'substr';
         }
 
-        $toolbar = "\n".str_replace("\n", '', $this->templating->render('WebProfilerBundle:Profiler:toolbar_js.html.twig', array('token' => $response->headers->get('X-Debug-Token'))))."\n";
         $content = $response->getContent();
 
         if (false !== $pos = $posrFunction($content, '</body>')) {
+            $toolbar = "\n".str_replace("\n", '', $this->templating->render('WebProfilerBundle:Profiler:toolbar_js.html.twig', array('token' => $response->headers->get('X-Debug-Token'))))."\n";
             $content = $substrFunction($content, 0, $pos).$toolbar.$substrFunction($content, $pos);
+            $response->setContent($content);
         }
-
-        $response->setContent($content);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -86,13 +86,12 @@ protected function injectToolbar(Response $response)`
`86`	`86`	`$substrFunction = 'substr';`
`87`	`87`	`}`
`88`	`88`
`89`		`- $toolbar = "\n".str_replace("\n", '', $this->templating->render('WebProfilerBundle:Profiler:toolbar_js.html.twig', array('token' => $response->headers->get('X-Debug-Token'))))."\n";`
`90`	`89`	`$content = $response->getContent();`
`91`	`90`
`92`	`91`	`if (false !== $pos = $posrFunction($content, '</body>')) {`
	`92`	`+ $toolbar = "\n".str_replace("\n", '', $this->templating->render('WebProfilerBundle:Profiler:toolbar_js.html.twig', array('token' => $response->headers->get('X-Debug-Token'))))."\n";`
`93`	`93`	`$content = $substrFunction($content, 0, $pos).$toolbar.$substrFunction($content, $pos);`
	`94`	`+ $response->setContent($content);`
`94`	`95`	`}`
`95`		`-`
`96`		`- $response->setContent($content);`
`97`	`96`	`}`
`98`	`97`	`}`