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

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

Browse Source
This commit is contained in:
thinkphp
2016-06-07 22:26:26 +08:00
parent a7f9fa3603 bdd304b369
commit 2a026c6aef
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/think/App.php
View File

@@ -272,13 +272,14 @@ class App
Hook::listen('module_init', $request); Hook::listen('module_init', $request);
try { try {
$instance = Loader::controller($controller, $config['url_controller_layer'], $config['use_controller_suffix'], $config['empty_controller']);
// 获取当前操作名 // 获取当前操作名
$action = $actionName . $config['action_suffix']; $action = $actionName . $config['action_suffix'];
if (!preg_match('/^[A-Za-z](\w)*$/', $action)) { if (!preg_match('/^[A-Za-z](\w)*$/', $action)) {
// 非法操作 // 非法操作
throw new \ReflectionException('illegal action name :' . $actionName); throw new \ReflectionException('illegal action name :' . $actionName);
} }
$instance = Loader::controller($controller, $config['url_controller_layer'], $config['use_controller_suffix'], $config['empty_controller']);
// 执行操作方法 // 执行操作方法
$call = [$instance, $action]; $call = [$instance, $action];