bug #12575 [WebProfilerBundle] Remove usage of app.request in search bar template (jeromemacias)

fabpot · fabpot · commit 6a59db5a084b · 2014-11-26T09:17:16.000+01:00
This PR was merged into the 2.6 branch. Discussion ---------- [WebProfilerBundle] Remove usage of app.request in search bar template This PR removes the last usage of the global Twig variable `app.request` in Symfony. | Q | A | ------------- | --- | Bug fix? | kinda | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | License | MIT Commits ------- d3451fc [WebProfilerBundle] Remove usage of app.request in search bar template
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php
@@ -249,6 +249,7 @@ public function searchBarAction(Request $request)
             'start' => $start,
             'end' => $end,
             'limit' => $limit,
+            'request' => $request,
         )), 200, array('Content-Type' => 'text/html'));
     }
 
diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/search.html.twig
@@ -15,7 +15,7 @@
         </select>
         <div class="clear-fix"></div>
         <label for="url">URL</label>
-        <input type="url" name="url" id="url" value="{{ url }}" placeholder="e.g. {{ app.request.baseUrl }}">
+        <input type="url" name="url" id="url" value="{{ url }}" placeholder="e.g. {{ request.baseUrl }}">
         <div class="clear-fix"></div>
         <label for="token">Token</label>
         <input type="text" name="token" id="token" value="{{ token }}" placeholder="e.g. 1f321b">

Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,7 @@ public function searchBarAction(Request $request)`
`249`	`249`	`'start' => $start,`
`250`	`250`	`'end' => $end,`
`251`	`251`	`'limit' => $limit,`
	`252`	`+ 'request' => $request,`
`252`	`253`	`)), 200, array('Content-Type' => 'text/html'));`
`253`	`254`	`}`
`254`	`255`