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

去除 MODULE_NAME CONTROLLER_NAME ACTION_NAME 常量

Browse Source
This commit is contained in:
thinkphp
2016-06-01 18:34:36 +08:00
parent 4a4c53bf6b
commit ac0cb9be42
11 changed files with 123 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
library/think/Loader.php
View File

@@ -12,6 +12,7 @@
namespace think;
use think\exception\HttpException;
use think\Request;
class Loader
{
@@ -276,7 +277,7 @@ class Loader
if (strpos($name, '/')) {
list($module, $name) = explode('/', $name, 2);
} else {
$module = APP_MULTI_MODULE ? MODULE_NAME : '';
$module = APP_MULTI_MODULE ? Request::instance()->module() : '';
}
$class = self::parseClass($module, $layer, $name, $appendSuffix);
if (class_exists($class)) {
@@ -311,7 +312,7 @@ class Loader
if (strpos($name, '/')) {
list($module, $name) = explode('/', $name);
} else {
$module = APP_MULTI_MODULE ? MODULE_NAME : '';
$module = APP_MULTI_MODULE ? Request::instance()->module() : '';
}
$class = self::parseClass($module, $layer, $name, $appendSuffix);
if (class_exists($class)) {
@@ -346,7 +347,7 @@ class Loader
if (strpos($name, '/')) {
list($module, $name) = explode('/', $name);
} else {
$module = APP_MULTI_MODULE ? MODULE_NAME : '';
$module = APP_MULTI_MODULE ? Request::instance()->module() : '';
}
$class = self::parseClass($module, $layer, $name, $appendSuffix);
if (class_exists($class)) {
@@ -385,7 +386,7 @@ class Loader
{
$info = pathinfo($url);
$action = $info['basename'];
$module = '.' != $info['dirname'] ? $info['dirname'] : CONTROLLER_NAME;
$module = '.' != $info['dirname'] ? $info['dirname'] : Request::instance()->controller();
$class = self::controller($module, $layer, $appendSuffix);
if ($class) {
if (is_scalar($vars)) {