From 7334f5b0f18ff7cc1dd4688d475ac26642662d8f Mon Sep 17 00:00:00 2001
From: leunggamciu <gamciuleung@gmail.com>
Date: Thu, 16 Jun 2016 16:04:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=93=E5=BC=80=E5=90=AFur?=
 =?UTF-8?q?l=5Fcommon=5Fparam=E6=97=B6=EF=BC=8C=E7=94=9F=E6=88=90=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E7=9A=84URL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Url.php                    | 2 +-
 tests/thinkphp/library/think/urlTest.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/library/think/Url.php b/library/think/Url.php
index a0d774b6..a4674edf 100644
--- a/library/think/Url.php
+++ b/library/think/Url.php
@@ -98,7 +98,7 @@ class Url
             // 添加参数
             if (Config::get('url_common_param')) {
                 $vars = urldecode(http_build_query($vars));
-                $url .= $suffix . $anchor . '?' . $vars;
+                $url .= $suffix . '?' . $vars . $anchor;
             } else {
                 foreach ($vars as $var => $val) {
                     if ('' !== trim($val)) {
diff --git a/tests/thinkphp/library/think/urlTest.php b/tests/thinkphp/library/think/urlTest.php
index 96fa0788..1a8e22f8 100644
--- a/tests/thinkphp/library/think/urlTest.php
+++ b/tests/thinkphp/library/think/urlTest.php
@@ -72,5 +72,8 @@ class urlTest extends \PHPUnit_Framework_TestCase
         Route::get('blog/:id', 'index/blog');
         Config::set('url_html_suffix', 'shtml');
         $this->assertEquals('/blog/10.shtml#detail', Url::build('/blog/10#detail'));
+
+        Config::set('url_common_param', true);
+        $this->assertEquals('/blog/10.shtml?foo=bar#detail', Url::build('/blog/10#detail', "foo=bar"));
     }
 }