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

Fix issue #209 default timezone

Merge pull request #210 from bwoester/fix-209-default-timezone
71897b4b · Qiang Xue · d9923c54 · 49a4314a · 71897b4b
Commit 71897b4b authored May 10, 2013 by Qiang Xue
Show whitespace changes
Inline Side-by-side

Showing with 7 additions and 0 deletions

Application.php yii/base/Application.php +7 -0

No files found.
--- a/yii/base/Application.php
+++ b/yii/base/Application.php
@@ -85,6 +85,13 @@ class Application extends Module
 			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')) {
 			$this->setTimeZone('UTC');
 		}