mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-08 23:52:49 +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

1
base.php
View File

@@ -51,3 +51,4 @@ define('IS_CGI', strpos(PHP_SAPI, 'cgi') === 0 ? 1 : 0);
define('IS_CLI', PHP_SAPI == 'cli' ? 1 : 0); define('IS_CLI', PHP_SAPI == 'cli' ? 1 : 0);
define('IS_WIN', strstr(PHP_OS, 'WIN') ? 1 : 0); define('IS_WIN', strstr(PHP_OS, 'WIN') ? 1 : 0);
define('IS_MAC', strstr(PHP_OS, 'Darwin') ? 1 : 0); define('IS_MAC', strstr(PHP_OS, 'Darwin') ? 1 : 0);
define('NOW_TIME', $_SERVER['REQUEST_TIME']);

2
library/think/App.php
View File

@@ -39,9 +39,7 @@ class App
{ {
is_null($request) && $request = Request::instance(); is_null($request) && $request = Request::instance();
define('NOW_TIME', $request->time());
define('REQUEST_METHOD', $request->method()); define('REQUEST_METHOD', $request->method());
define('HTTP_HOST', $request->host());
define('IS_GET', REQUEST_METHOD == 'GET' ? true : false); define('IS_GET', REQUEST_METHOD == 'GET' ? true : false);
define('IS_POST', REQUEST_METHOD == 'POST' ? true : false); define('IS_POST', REQUEST_METHOD == 'POST' ? true : false);
define('IS_PUT', REQUEST_METHOD == 'PUT' ? 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 是否递归合并 * @param boolean $recursive 是否递归合并
* @return void * @return void
*/ */
public static function import(array $tags, $recursive = true) public static function import($tags, $recursive = true)
{ {
empty($tags) && $tags = [];
if (!$recursive) { if (!$recursive) {
// 覆盖导入 // 覆盖导入
self::$tags = array_merge(self::$tags, $tags); self::$tags = array_merge(self::$tags, $tags);

3
library/think/Request.php
View File

@@ -240,7 +240,8 @@ class Request
$this->baseUrl = $url; $this->baseUrl = $url;
return; return;
} elseif (!$this->baseUrl) { } 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; return true === $url ? $this->domain() . $this->baseUrl : $this->baseUrl;
} }