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

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

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);