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

修正

Browse Source
This commit is contained in:
thinkphp
2017-10-20 11:28:42 +08:00
parent 07b7b90327
commit 983b3afe49
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/think/Loader.php
View File

@@ -369,7 +369,7 @@ class Loader
if (isset(self::$instance[$guid])) { if (isset(self::$instance[$guid])) {
return self::$instance[$guid]; return self::$instance[$guid];
} }
list($module, $class) = $this->getModuleAndClass($name, $layer, $appendSuffix); list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix);
if (class_exists($class)) { if (class_exists($class)) {
$model = new $class(); $model = new $class();
} else { } else {
@@ -395,7 +395,7 @@ class Loader
*/ */
public static function controller($name, $layer = 'controller', $appendSuffix = false, $empty = '') public static function controller($name, $layer = 'controller', $appendSuffix = false, $empty = '')
{ {
list($module, $class) = $this->getModuleAndClass($name, $layer, $appendSuffix); list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix);
if (class_exists($class)) { if (class_exists($class)) {
return App::invokeClass($class); return App::invokeClass($class);
} elseif ($empty && class_exists($emptyClass = self::parseClass($module, $layer, $empty, $appendSuffix))) { } elseif ($empty && class_exists($emptyClass = self::parseClass($module, $layer, $empty, $appendSuffix))) {
@@ -424,7 +424,7 @@ class Loader
if (isset(self::$instance[$guid])) { if (isset(self::$instance[$guid])) {
return self::$instance[$guid]; return self::$instance[$guid];
} }
list($module, $class) = $this->getModuleAndClass($name, $layer, $appendSuffix); list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix);
if (class_exists($class)) { if (class_exists($class)) {
$validate = new $class; $validate = new $class;
} else { } else {
@@ -446,7 +446,7 @@ class Loader
* @param bool $appendSuffix 是否添加类名后缀 * @param bool $appendSuffix 是否添加类名后缀
* @return array * @return array
*/ */
protected function getModuleAndClass($name, $layer, $appendSuffix) protected static function getModuleAndClass($name, $layer, $appendSuffix)
{ {
if (false !== strpos($name, '\\')) { if (false !== strpos($name, '\\')) {
$module = Request::instance()->module(); $module = Request::instance()->module();