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

Merge branch 'master' of https://github.com/top-think/think

Browse Source
This commit is contained in:
oldrind
2016-03-17 09:36:12 +08:00
parent 9ddfadb321 dcee66e4cd
commit ee8e6a26c0
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/App.php
View File

@@ -373,6 +373,8 @@ class App
// 路由无效默认分析为模块/控制器/操作/参数...方式URL // 路由无效默认分析为模块/控制器/操作/参数...方式URL
$result = Route::parseUrl($_SERVER['PATH_INFO'], $depr); $result = Route::parseUrl($_SERVER['PATH_INFO'], $depr);
} }
//保证$_REQUEST正常取值
$_REQUEST = array_merge($_POST, $_GET, $_COOKIE);
// 注册调度机制 // 注册调度机制
self::dispatch($result); self::dispatch($result);
} }

8
library/think/View.php
View File

@@ -40,14 +40,15 @@ class View
// 视图驱动命名空间 // 视图驱动命名空间
'namespace' => '\\think\\view\\driver\\', 'namespace' => '\\think\\view\\driver\\',
// 模板引擎配置参数 // 模板引擎配置参数
'template' => [ 'template' => [],
'type' => 'think',
],
]; ];
public function __construct(array $config = []) public function __construct(array $config = [])
{ {
$this->config($config); $this->config($config);
if (!isset($this->config['template']['type'])) {
$this->config['template']['type'] = 'think';
}
} }
/** /**
@@ -122,6 +123,7 @@ class View
if (empty($this->config['view_path']) && defined('VIEW_PATH')) { if (empty($this->config['view_path']) && defined('VIEW_PATH')) {
$this->config['view_path'] = VIEW_PATH; $this->config['view_path'] = VIEW_PATH;
} }
$config = array_merge($config, [ $config = array_merge($config, [
'view_path' => $this->config['view_path'], 'view_path' => $this->config['view_path'],
'view_suffix' => $this->config['view_suffix'], 'view_suffix' => $this->config['view_suffix'],