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

改进 traits\model\adv 的延迟更新数据方法 和 app类对于 空操作的处理

Browse Source
This commit is contained in:
thinkphp
2015-12-14 21:11:00 +08:00
parent f035ed944f
commit 6b1642f4a0
3 changed files with 86 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
library/think/app.php
View File

@@ -122,7 +122,9 @@ class App
// 操作不存在
if (method_exists($instance, '_empty')) {
$method = new \ReflectionMethod($instance, '_empty');
$method->invokeArgs($instance, [$action, '']);
$data = $method->invokeArgs($instance, [$action, '']);
// 返回数据
Response::returnData($data, $config['default_return_type'], $config['response_exit']);
} else {
throw new Exception('method [ ' . (new \ReflectionClass($instance))->getName() . '->' . $action . ' ] not exists ', 10002);
}
@@ -275,10 +277,10 @@ class App
$depr = $config['pathinfo_depr'];
// 还原劫持后真实pathinfo
$path_info =
(defined('BIND_MODULE') ? BIND_MODULE . $depr : '') .
(defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') .
(defined('BIND_ACTION') ? BIND_ACTION . $depr : '') .
__INFO__;
(defined('BIND_MODULE') ? BIND_MODULE . $depr : '') .
(defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') .
(defined('BIND_ACTION') ? BIND_ACTION . $depr : '') .
__INFO__;
// 路由检测
if (!empty($config['url_route_on'])) {

2
library/think/url.php
View File

@@ -93,7 +93,7 @@ class Url
$suffix = substr($suffix, 0, $pos);
}
}
return 0 === strpos($suffix,'.') ? $suffix : (empty($suffix)? $suffix: '.'.$suffix);
return (empty($suffix) || 0 === strpos($suffix, '.')) ? $suffix : '.' . $suffix;
}
// 根据路由名称和参数生成URL地址