From 944d3885ba1c15b20a22da721dbcf206b425240e Mon Sep 17 00:00:00 2001 From: Martijn Hartlief Date: Thu, 9 May 2019 18:29:46 +0200 Subject: [PATCH] Reverted redirect to absolute url Changed toolbar_item to use url instead of path --- .../WebProfilerBundle/Controller/ProfilerController.php | 6 +++--- .../Resources/views/Profiler/toolbar_item.html.twig | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php index 43388a566f369..cc0b14480f3b3 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php +++ b/src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php @@ -72,7 +72,7 @@ public function homeAction() $this->profiler->disable(); - return new RedirectResponse($this->generator->generate('_profiler_search_results', ['token' => 'empty', 'limit' => 10], RouterInterface::ABSOLUTE_URL), 302, ['Content-Type' => 'text/html']); + return new RedirectResponse($this->generator->generate('_profiler_search_results', ['token' => 'empty', 'limit' => 10]), 302, ['Content-Type' => 'text/html']); } /** @@ -321,7 +321,7 @@ public function searchAction(Request $request) } if (!empty($token)) { - return new RedirectResponse($this->generator->generate('_profiler', ['token' => $token], RouterInterface::ABSOLUTE_URL), 302, ['Content-Type' => 'text/html']); + return new RedirectResponse($this->generator->generate('_profiler', ['token' => $token]), 302, ['Content-Type' => 'text/html']); } $tokens = $this->profiler->find($ip, $url, $limit, $method, $start, $end, $statusCode); @@ -335,7 +335,7 @@ public function searchAction(Request $request) 'start' => $start, 'end' => $end, 'limit' => $limit, - ], RouterInterface::ABSOLUTE_URL), 302, ['Content-Type' => 'text/html']); + ]), 302, ['Content-Type' => 'text/html']); } /** diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig index 4f51396f99897..d81e877977667 100644 --- a/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig +++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/views/Profiler/toolbar_item.html.twig @@ -1,5 +1,5 @@
- {% if link is not defined or link %}{% endif %} + {% if link is not defined or link %}{% endif %}
{{ icon|default('') }}
{% if link|default(false) %}
{% endif %}
{{ text|default('') }}