From 2e78da928b79e78ac315515271549cf9eac80bd1 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Fri, 27 Mar 2020 22:34:14 +0800
Subject: [PATCH] make url generation flexible

---
 app/Http/View/Composers/LanguagesMenuComposer.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Http/View/Composers/LanguagesMenuComposer.php b/app/Http/View/Composers/LanguagesMenuComposer.php
index e7b030e3..98be1ad4 100644
--- a/app/Http/View/Composers/LanguagesMenuComposer.php
+++ b/app/Http/View/Composers/LanguagesMenuComposer.php
@@ -19,15 +19,15 @@ class LanguagesMenuComposer
     public function compose(View $view)
     {
         $query = $this->request->query();
-        $url = $this->request->url();
+        $path = $this->request->path();
 
         $langs = collect(config('locales'))
             ->reject(function ($locale) {
                 return Arr::has($locale, 'alias');
             })
-            ->map(function ($locale, $id) use ($query, $url) {
+            ->map(function ($locale, $id) use ($query, $path) {
                 $query = array_merge($query, ['lang' => $id]);
-                $locale['url'] = $url.'?'.http_build_query($query);
+                $locale['url'] = url($path.'?'.http_build_query($query));
 
                 return $locale;
             });