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

改进Route类的check方法 对分组路由的完善 改进PHP模板引擎驱动

Browse Source
This commit is contained in:
thinkphp
2016-07-18 17:28:39 +08:00
parent 1bc85bb5be
commit 9a6b90cc69
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Route.php
View File

@@ -745,7 +745,7 @@ class Route
continue;
}
if ($group) {
$rule = $group . '/' . ltrim($rule, '/');
$rule = $group . ($rule ? '/' . ltrim($rule, '/') : '');
}
$result = self::checkRule($rule, $route, $url, $pattern, $option);
if (false !== $result) {

20
library/think/view/driver/Php.php
View File

@@ -67,8 +67,14 @@ class Php
}
// 记录视图信息
App::$debug && Log::record('[ VIEW ] ' . $template . ' [ ' . var_export(array_keys($data), true) . ' ]', 'info');
extract($data, EXTR_OVERWRITE);
include $template;
if (isset($data['template'])) {
$__template__ = $template;
extract($data, EXTR_OVERWRITE);
include $__template__;
} else {
extract($data, EXTR_OVERWRITE);
include $template;
}
}
/**
@@ -80,8 +86,14 @@ class Php
*/
public function display($content, $data = [])
{
extract($data, EXTR_OVERWRITE);
eval('?>' . $content);
if (isset($data['content'])) {
$__content__ = $content;
extract($data, EXTR_OVERWRITE);
eval('?>' . $__content__);
} else {
extract($data, EXTR_OVERWRITE);
eval('?>' . $content);
}
}
/**