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

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

Browse Source
This commit is contained in:
thinkphp
2016-01-29 16:25:41 +08:00
parent be430c15bb 609d5a705c
commit 52c2cd0533
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helper.php
View File

@@ -294,7 +294,7 @@ function trace($log = '[think]', $level = 'log')
* @param array $vars 模板变量
* @return string
*/
function V($template, $vars)
function V($template = '', $vars = [])
{
return \think\View::instance(\think\Config::get())->fetch($template, $vars);
}

2
library/think/Route.php
View File

@@ -499,7 +499,7 @@ class Route
if (false !== $match = self::match($url, $rule, $pattern)) {
// 匹配到路由规则
// 检测是否定义路由
if ($option['after_behavior']) {
if (!empty($option['after_behavior'])) {
Hook::exec($option['after_behavior'], $route);
}
if ($route instanceof \Closure) {

2
library/think/Template.php
View File

@@ -56,7 +56,7 @@ class Template
*/
public function __construct(array $config = [])
{
$this->config['cache_path'] = RUNTIME_PATH . 'template' . DS;
$this->config['cache_path'] = RUNTIME_PATH . 'temp' . DS;
$this->config = array_merge($this->config, empty($config) ? (array) Config::get('template') : $config);
$this->config['taglib_begin'] = $this->stripPreg($this->config['taglib_begin']);
$this->config['taglib_end'] = $this->stripPreg($this->config['taglib_end']);