Skip to content

Commit

Permalink
Merge pull request #8016 in SW/shopware from sw-24473/5.6/synchronize…
Browse files Browse the repository at this point in the history
…-sy-request to 5.6

* commit '6c167ac076ba2c2b09c66492439c4d6166e2a349':
  SW-24473 - Synchronize symfony request
  • Loading branch information
soebbing committed Aug 26, 2019
2 parents 3ebb579 + 6c167ac commit f9a783f
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ public function install()
*/
public function onRouteShutdown(Enlight_Controller_EventArgs $args)
{
/** @var Enlight_Controller_Request_RequestHttp $request */
$request = $args->getRequest();
$config = $this->Config();

Expand Down Expand Up @@ -156,6 +157,10 @@ public function onRouteShutdown(Enlight_Controller_EventArgs $args)
}

unset($process);
$request->query->replace($_GET);
$request->request->replace($_POST);
$request->cookies->replace($_COOKIE);
$request->server->replace($_SERVER);
$request->setParams($userParams);
}

Expand Down
2 changes: 1 addition & 1 deletion themes/Frontend/Bare/frontend/search/fuzzy.tpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
{block name='frontend_index_start'}
{if $sRequests.sSearchOrginal}
{s name="SearchResultsFor" assign="snippetSearchResultsFor"}{/s}
{$sBreadcrumb = [['name' => $snippetSearchResultsFor]]}
{$sBreadcrumb = [['name' => $snippetSearchResultsFor|htmlentities]]}
{else}
{s name="SearchResultsEmpty" assign="snippetSearchResultsEmpty"}{/s}
{$sBreadcrumb = [['name' => $snippetSearchResultsEmpty]]}
Expand Down

0 comments on commit f9a783f

Please sign in to comment.