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

2026-07-01 20:52:48 +08:00 · 2016-06-07 22:26:26 +08:00
parent a7f9fa3603 bdd304b369
commit 2a026c6aef
1 changed files with 2 additions and 1 deletions
--- a/library/think/App.php
+++ b/library/think/App.php
@@ -272,13 +272,14 @@ class App
        Hook::listen('module_init', $request);

        try {
+            $instance = Loader::controller($controller, $config['url_controller_layer'], $config['use_controller_suffix'], $config['empty_controller']);
+            
            // 获取当前操作名
            $action = $actionName . $config['action_suffix'];
            if (!preg_match('/^[A-Za-z](\w)*$/', $action)) {
                // 非法操作
                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];