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

添加默认时区参数

Browse Source
This commit is contained in:
thinkphp
2015-12-14 12:13:47 +08:00
parent d01443719b
commit e1c5769a30
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
convention.php
View File

@@ -21,6 +21,8 @@ return [
'default_jsonp_handler' => 'jsonpReturn', 'default_jsonp_handler' => 'jsonpReturn',
// 默认JSONP处理方法 // 默认JSONP处理方法
'var_jsonp_handler' => 'callback', 'var_jsonp_handler' => 'callback',
// 默认时区
'default_timezone' => 'PRC',
// +---------------------------------------------------------------------- // +----------------------------------------------------------------------
// | 模块设置 // | 模块设置

10
library/think/app.php
View File

@@ -47,6 +47,8 @@ class App
if (SLOG_ON) { if (SLOG_ON) {
Slog::config($config['slog']); Slog::config($config['slog']);
} }
// 设置系统时区
date_default_timezone_set($config['default_timezone']);
// 默认语言 // 默认语言
$lang = strtolower($config['default_lang']); $lang = strtolower($config['default_lang']);
@@ -273,10 +275,10 @@ class App
$depr = $config['pathinfo_depr']; $depr = $config['pathinfo_depr'];
// 还原劫持后真实pathinfo // 还原劫持后真实pathinfo
$path_info = $path_info =
(defined('BIND_MODULE') ? BIND_MODULE . $depr : '') . (defined('BIND_MODULE') ? BIND_MODULE . $depr : '') .
(defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') . (defined('BIND_CONTROLLER') ? BIND_CONTROLLER . $depr : '') .
(defined('BIND_ACTION') ? BIND_ACTION . $depr : '') . (defined('BIND_ACTION') ? BIND_ACTION . $depr : '') .
__INFO__; __INFO__;
// 路由检测 // 路由检测
if (!empty($config['url_route_on'])) { if (!empty($config['url_route_on'])) {