FilterEditor: Merge preserved query params as encoded params
This way the query param values are not encoded twice. fixes #4321
This commit is contained in:
parent
94a16056d7
commit
8b0fd4daaf
|
@ -288,7 +288,10 @@ class FilterEditor extends AbstractWidget
|
||||||
$url = Url::fromRequest()->onlyWith($this->preserveParams);
|
$url = Url::fromRequest()->onlyWith($this->preserveParams);
|
||||||
$urlParams = $url->getParams();
|
$urlParams = $url->getParams();
|
||||||
$url->setQueryString($filter->toQueryString());
|
$url->setQueryString($filter->toQueryString());
|
||||||
$url->getParams()->mergeValues($urlParams->toArray(false));
|
foreach ($urlParams->toArray(false) as $key => $value) {
|
||||||
|
$url->getParams()->addEncoded($key, $value);
|
||||||
|
}
|
||||||
|
|
||||||
$this->redirectNow($url);
|
$this->redirectNow($url);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue