Merging upstream version 1.1.2.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 9 insertions, 1 deletions

diff --git a/application/controllers/MigrateController.php b/application/controllers/MigrateController.php
index 811b5d0..c14eef7 100644
--- a/application/controllers/MigrateController.php
+++ b/application/controllers/MigrateController.php
@@ -90,8 +90,16 @@ class MigrateController extends Controller
             $params = $url->onlyWith(['sort', 'limit', 'view', 'columns', 'page'])->getParams();
             $filter = $url->without(['sort', 'limit', 'view', 'columns', 'page'])->getParams();
             $filter = QueryString::parse((string) $filter);
+            $nonStrictOriginalFilter = QueryString::render($filter);
             $filter = UrlMigrator::transformLegacyWildcardFilter($filter);
-            $result[] = rawurldecode($url->setParams($params)->setFilter($filter)->getAbsoluteUrl());
+            $nonStrictUpdatedFilter = QueryString::render($filter);
+            if ($nonStrictUpdatedFilter !== $nonStrictOriginalFilter) {
+                // The original filter might be formatted loosely, so if we render it again,
+                // it might look different although nothing changed
+                $result[] = rawurldecode($url->setParams($params)->setFilter($filter)->getAbsoluteUrl());
+            } else {
+                $result[] = $urlString;
+            }
         }
 
         $response = $this->getResponse()->json();