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

View类和模板引擎驱动分离调整 模板主题功能取消

Browse Source
This commit is contained in:
thinkphp
2016-04-18 15:32:18 +08:00
parent 455a18e85a
commit c2ef6cc883
6 changed files with 231 additions and 169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/Controller.php
View File

@@ -13,6 +13,8 @@ namespace think;
\think\Loader::import('controller/Jump', TRAIT_PATH, EXT);
use think\View;
class Controller
{
use \traits\controller\Jump;
@@ -33,7 +35,7 @@ class Controller
*/
public function __construct()
{
$this->view = \think\View::instance(Config::get());
$this->view = View::instance(Config::get('view'));
// 控制器初始化
if (method_exists($this, '_initialize')) {
@@ -102,7 +104,7 @@ class Controller
*/
public function display($template = '', $vars = [], $config = [])
{
return $this->view->fetch($template, $vars, $config);
return $this->view->display($template, $vars, $config);
}
/**