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

APP_MULTI_MODULE常量改为app_multi_module配置参数

Browse Source
This commit is contained in:
thinkphp
2016-06-14 08:12:14 +08:00
parent eb026e02a6
commit 87a3c5577c
9 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
library/think/App.php
View File

@@ -55,7 +55,7 @@ class App
$request->langset(Lang::detect());
// 加载系统语言包
Lang::load(THINK_PATH . 'lang' . DS . $request->langset() . EXT);
if (!APP_MULTI_MODULE) {
if (!$config['app_multi_module']) {
Lang::load(APP_PATH . 'lang' . DS . $request->langset() . EXT);
}
}
@@ -205,7 +205,7 @@ class App
if (is_string($result)) {
$result = explode('/', $result);
}
if (APP_MULTI_MODULE) {
if ($config['app_multi_module']) {
// 多模块部署
$module = strip_tags(strtolower($result[0] ?: $config['default_module']));
$bind = Route::bind('module');
@@ -326,7 +326,7 @@ class App
private static function init($module = '')
{
// 定位模块目录
$module = ($module && APP_MULTI_MODULE) ? $module . DS : '';
$module = ($module) ? $module . DS : '';
// 加载初始化文件
if (is_file(APP_PATH . $module . 'init' . EXT)) {