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

取消 MODULE_PATH 常量 用 App::$modulePath 替代

Browse Source
This commit is contained in:
thinkphp
2016-06-14 14:57:12 +08:00
parent 09a7b91fef
commit 5e7c8e9902
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
library/think/App.php
View File

@@ -34,6 +34,11 @@ class App
*/ */
protected static $init = false; protected static $init = false;
/**
* @var string 当前模块路径
*/
public static $modulePath;
/** /**
* 执行应用程序 * 执行应用程序
* @access public * @access public
@@ -232,7 +237,7 @@ class App
$module = ''; $module = '';
} }
// 当前模块路径 // 当前模块路径
define('MODULE_PATH', APP_PATH . ($module ? $module . DS : '')); App::$modulePath = APP_PATH . ($module ? $module . DS : '');
// 获取控制器名 // 获取控制器名
$controller = strip_tags($result[1] ?: $config['default_controller']); $controller = strip_tags($result[1] ?: $config['default_controller']);

2
library/think/Loader.php
View File

@@ -239,7 +239,7 @@ class Loader
$baseUrl = self::$namespace[$name]; $baseUrl = self::$namespace[$name];
} elseif ('@' == $name) { } elseif ('@' == $name) {
//加载当前模块应用类库 //加载当前模块应用类库
$baseUrl = MODULE_PATH; $baseUrl = App::$modulePath;
} elseif (is_dir(EXTEND_PATH . $name)) { } elseif (is_dir(EXTEND_PATH . $name)) {
$baseUrl = EXTEND_PATH; $baseUrl = EXTEND_PATH;
} else { } else {

5
library/think/view/driver/Php.php
View File

@@ -11,6 +11,7 @@
namespace think\view\driver; namespace think\view\driver;
use think\App;
use think\exception\TemplateNotFoundException; use think\exception\TemplateNotFoundException;
use think\Log; use think\Log;
use think\Request; use think\Request;
@@ -91,8 +92,8 @@ class Php
*/ */
private function parseTemplate($template) private function parseTemplate($template)
{ {
if (empty($this->config['view_path']) && defined('MODULE_PATH')) { if (empty($this->config['view_path'])) {
$this->config['view_path'] = MODULE_PATH . 'view' . DS; $this->config['view_path'] = App::$modulePath . 'view' . DS;
} }
if (strpos($template, '@')) { if (strpos($template, '@')) {

5
library/think/view/driver/Think.php
View File

@@ -11,6 +11,7 @@
namespace think\view\driver; namespace think\view\driver;
use think\App;
use think\exception\TemplateNotFoundException; use think\exception\TemplateNotFoundException;
use think\Log; use think\Log;
use think\Request; use think\Request;
@@ -35,8 +36,8 @@ class Think
public function __construct($config = []) public function __construct($config = [])
{ {
$this->config = array_merge($this->config, $config); $this->config = array_merge($this->config, $config);
if (empty($this->config['view_path']) && defined('MODULE_PATH')) { if (empty($this->config['view_path'])) {
$this->config['view_path'] = MODULE_PATH . 'view' . DS; $this->config['view_path'] = App::$modulePath . 'view' . DS;
} }
$this->template = new Template($this->config); $this->template = new Template($this->config);
} }