bug #16104 Pass missing request template variables (WouterJ)

fabpot · fabpot · commit ef7aeaa47c14 · 2015-10-05T09:20:16.000+02:00
This PR was merged into the 2.8 branch. Discussion ---------- Pass missing request template variables Some render calls were missing the `request` variable, while it is used in the `layout.html.twig` template. | Q | A | --- | --- | Fixed tickets | - | License | MIT Commits ------- 7f1b2c2 Pass missing request template variables
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -96,7 +96,7 @@ public function panelAction(Request $request, $token)
         }
 
         if (!$profile = $this->profiler->loadProfile($token)) {
-            return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array('about' => 'no_token', 'token' => $token)), 200, array('Content-Type' => 'text/html'));
+            return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array('about' => 'no_token', 'token' => $token, 'request' => $request)), 200, array('Content-Type' => 'text/html'));
         }
 
         if (!$profile->hasCollector($panel)) {
@@ -140,13 +140,14 @@ public function purgeAction()
     /**
      * Displays information page.
      *
-     * @param string $about The about message
+     * @param Request $request The current HTTP Request
+     * @param string  $about   The about message
      *
      * @return Response A Response instance
      *
      * @throws NotFoundHttpException
      */
-    public function infoAction($about)
+    public function infoAction(Request $request, $about)
     {
         if (null === $this->profiler) {
             throw new NotFoundHttpException('The profiler must be enabled.');
@@ -156,6 +157,7 @@ public function infoAction($about)
 
         return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array(
             'about' => $about,
+            'request' => $request,
         )), 200, array('Content-Type' => 'text/html'));
     }
 

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ public function panelAction(Request $request, $token)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`if (!$profile = $this->profiler->loadProfile($token)) {`
`99`		`- return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array('about' => 'no_token', 'token' => $token)), 200, array('Content-Type' => 'text/html'));`
	`99`	`+ return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array('about' => 'no_token', 'token' => $token, 'request' => $request)), 200, array('Content-Type' => 'text/html'));`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`if (!$profile->hasCollector($panel)) {`
`@@ -140,13 +140,14 @@ public function purgeAction()`
`140`	`140`	`/**`
`141`	`141`	`* Displays information page.`
`142`	`142`	`*`
`143`		`- * @param string $about The about message`
	`143`	`+ * @param Request $request The current HTTP Request`
	`144`	`+ * @param string $about The about message`
`144`	`145`	`*`
`145`	`146`	`* @return Response A Response instance`
`146`	`147`	`*`
`147`	`148`	`* @throws NotFoundHttpException`
`148`	`149`	`*/`
`149`		`- public function infoAction($about)`
	`150`	`+ public function infoAction(Request $request, $about)`
`150`	`151`	`{`
`151`	`152`	`if (null === $this->profiler) {`
`152`	`153`	`throw new NotFoundHttpException('The profiler must be enabled.');`
`@@ -156,6 +157,7 @@ public function infoAction($about)`
`156`	`157`
`157`	`158`	`return new Response($this->twig->render('@WebProfiler/Profiler/info.html.twig', array(`
`158`	`159`	`'about' => $about,`
	`160`	`+ 'request' => $request,`
`159`	`161`	`)), 200, array('Content-Type' => 'text/html'));`
`160`	`162`	`}`
`161`	`163`