Fixed getLocalizedURL producing duplicate query string (side effect of …

…#578). (#602)
mcamara · Oct 30, 2018 · e82a6c9 · e82a6c9
1 parent f79896f
commit e82a6c9
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/Mcamara/LaravelLocalization/LaravelLocalization.php b/src/Mcamara/LaravelLocalization/LaravelLocalization.php
@@ -262,6 +262,7 @@ public function getLocalizedURL($locale = null, $url = null, $attributes = [], $
             $url = $this->request->fullUrl();
         } else {
             $url = $this->url->to($url);
+            $url = preg_replace('/'. preg_quote($urlQuery, '/') . '$/', '', $url);
         }
 
         if ($locale && $translatedRoute = $this->findTranslatedRouteByUrl($url, $attributes, $this->currentLocale)) {

diff --git a/tests/LocalizerTests.php b/tests/LocalizerTests.php
@@ -257,6 +257,11 @@ public function testGetLocalizedURL()
             app('laravellocalization')->getLocalizedURL('en', $this->test_url.'test')
         );
 
+        $this->assertEquals(
+            $this->test_url.'test?a=1',
+            app('laravellocalization')->getLocalizedURL('en', $this->test_url.'test?a=1')
+        );
+
         $crawler = $this->call(
             'GET',
             app('laravellocalization')->getLocalizedURL('en', $this->test_url.'test'),
@@ -278,6 +283,11 @@ public function testGetLocalizedURL()
             $this->test_url.'es/test',
             app('laravellocalization')->getLocalizedURL('es', $this->test_url.'test')
         );
+
+        $this->assertEquals(
+            $this->test_url.'es/test?a=1',
+            app('laravellocalization')->getLocalizedURL('es', $this->test_url.'test?a=1')
+        );
     }
 
     /**