From 5b0730574dc09546d700643a7c60820882e18398 Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Wed, 16 Dec 2015 19:39:03 +0100 Subject: [PATCH] Simplify Url::addFilter() This changes the rendered resulting Url from x&(y&z) to x&y&z. refs #10778 --- library/Icinga/Web/Url.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/library/Icinga/Web/Url.php b/library/Icinga/Web/Url.php index ac8e7af22..4f978370b 100644 --- a/library/Icinga/Web/Url.php +++ b/library/Icinga/Web/Url.php @@ -219,10 +219,9 @@ class Url public function addFilter($and) { $this->setQueryString( - Filter::matchAll( - $and, - Filter::fromQueryString($this->getQueryString()) - )->toQueryString() + Filter::fromQueryString($this->getQueryString()) + ->andFilter($and) + ->toQueryString() ); return $this; }