From 2ed5dad5828f4c524310c4157af0d741216568e1 Mon Sep 17 00:00:00 2001
From: printempw <h@prinzeugen.net>
Date: Sat, 6 May 2017 21:50:17 +0800
Subject: [PATCH] Fix determining URL with language preferred

---
 resources/views/vendor/language.tpl | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/resources/views/vendor/language.tpl b/resources/views/vendor/language.tpl
index 88ab9b9f..ddc12921 100644
--- a/resources/views/vendor/language.tpl
+++ b/resources/views/vendor/language.tpl
@@ -8,11 +8,18 @@
     <ul class="dropdown-menu" role="menu">
         @foreach(config('locales') as $code => $langInfo)
             @if (!isset($langInfo['alias']))
-                @if (count($_GET) == 0 || (count($_GET) == 1 && isset($_GET['lang'])))
-                    <li class="locale"><a href="?lang={{ $code }}">{{ $langInfo['name'] }}</a></li>
-                @else
-                    <li class="locale"><a href="{{ $_SERVER['REQUEST_URI'] }}&lang={{ $code }}">{{ $langInfo['name'] }}</a></li>
-                @endif
+                <?php
+                    if (count($_GET) == 0) {
+                        $link = "?lang=$code";
+                    } elseif(isset($_GET['lang'])) {
+                        $link = str_replace("lang={$_GET['lang']}", "lang=$code", $_SERVER['REQUEST_URI']);
+                    } else {
+                        $link = $_SERVER['REQUEST_URI']."&lang=$code";
+                    }
+                ?>
+                <li class="locale">
+                    <a href="{{ $link }}">{{ $langInfo['name'] }}</a>
+                </li>
             @endif
         @endforeach
     </ul>