aboutsummaryrefslogtreecommitdiff
path: root/app/FreshRSS.php
diff options
context:
space:
mode:
Diffstat (limited to 'app/FreshRSS.php')
-rw-r--r--app/FreshRSS.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/FreshRSS.php b/app/FreshRSS.php
index 02460af69..e374fa827 100644
--- a/app/FreshRSS.php
+++ b/app/FreshRSS.php
@@ -101,7 +101,10 @@ class FreshRSS extends Minz_FrontController {
Minz_Translate::init($language);
$timezone = isset(FreshRSS_Context::$user_conf) ? FreshRSS_Context::$user_conf->timezone : '';
- date_default_timezone_set($timezone != '' ? $timezone : '' . ini_get('date.timezone'));
+ if ($timezone == '') {
+ $timezone = FreshRSS_Context::defaultTimeZone();
+ }
+ date_default_timezone_set($timezone);
}
private static function getThemeFileUrl($theme_id, $filename) {