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

修正Request类的baseUrl方法 修正Hook类的警告错误

Browse Source
This commit is contained in:
thinkphp
2016-05-25 10:29:25 +08:00
parent 44e86a7f53
commit 1a02bb7081
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/App.php
View File

@@ -39,9 +39,7 @@ class App
{
is_null($request) && $request = Request::instance();
define('NOW_TIME', $request->time());
define('REQUEST_METHOD', $request->method());
define('HTTP_HOST', $request->host());
define('IS_GET', REQUEST_METHOD == 'GET' ? true : false);
define('IS_POST', REQUEST_METHOD == 'POST' ? true : false);
define('IS_PUT', REQUEST_METHOD == 'PUT' ? true : false);

3
library/think/Hook.php
View File

@@ -43,8 +43,9 @@ class Hook
* @param boolean $recursive 是否递归合并
* @return void
*/
public static function import(array $tags, $recursive = true)
public static function import($tags, $recursive = true)
{
empty($tags) && $tags = [];
if (!$recursive) {
// 覆盖导入
self::$tags = array_merge(self::$tags, $tags);

3
library/think/Request.php
View File

@@ -240,7 +240,8 @@ class Request
$this->baseUrl = $url;
return;
} elseif (!$this->baseUrl) {
$this->baseUrl = rtrim($this->url(), '?' . $this->query());
$str = $this->url();
$this->baseUrl = strpos($str, '?') ? strstr($str, '?', true) : $str;
}
return true === $url ? $this->domain() . $this->baseUrl : $this->baseUrl;
}