Merge remote-tracking branch 'origin/MC-18475' into 2.2-develop-pr105

Author: StasKozar

lib/internal/Magento/Framework/Escaper.php

@@ -320,7 +320,7 @@ public function escapeJsQuote($data, $quote = '\'')
     public function escapeXssInUrl($data)
     {
         return htmlspecialchars(
-            $this->escapeScriptIdentifiers((string)$data),
+            $this->escapeScriptIdentifiers(html_entity_decode((string)$data)),
             $this->htmlSpecialCharsFlag | ENT_HTML5 | ENT_HTML401,
             'UTF-8',
             false

lib/internal/Magento/Framework/Test/Unit/EscaperTest.php

@@ -292,6 +292,10 @@ public function escapeUrlDataProvider(): array
                 'data' => "http://exam\r\nple.com/search?term=this+%26+that&view=list",
                 'expected' => "http://example.com/search?term=this+%26+that&view=list",
             ],
+            [
+                'data' => "http://example.com/",
+                'expected' => "http://example.com/",
+            ],
         ];
     }