Skip to content

Y
yii2
Commit 71897b4b by Qiang Xue
Options

Merge pull request #210 from bwoester/fix-209-default-timezone

Fix issue #209 default timezone
parents d9923c54 49a4314a
Showing with 7 additions and 0 deletions
yii/base/Application.php
...@@ -84,6 +84,13 @@ class Application extends Module ...@@ -84,6 +84,13 @@ class Application extends Module
} else { } else {
throw new InvalidConfigException('The "basePath" configuration is required.'); throw new InvalidConfigException('The "basePath" configuration is required.');
} }
if (isset($config['timeZone'])) {
$this->setTimeZone($config['timeZone']);
unset($config['timeZone']);
} elseif (!ini_get('date.timezone')) {
$this->setTimeZone('UTC');
}
if (!ini_get('date.timezone')) { if (!ini_get('date.timezone')) {
$this->setTimeZone('UTC'); $this->setTimeZone('UTC');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment