mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 12:42:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #131 from leunggamciu/fix-url-build

Browse Source 
修复当开启url_common_param时，生成错误的URL
This commit is contained in:
ThinkPHP
2016-06-21 08:31:25 +08:00
committed by GitHub
parent e48fbac66f 7334f5b0f1
commit 4d19a1cb2d
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Url.php
View File

@@ -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)) {

3
tests/thinkphp/library/think/urlTest.php
View File

@@ -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"));
}
}