diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php index e9dac4784..65269f697 100644 --- a/classes/context/Context.class.php +++ b/classes/context/Context.class.php @@ -261,6 +261,7 @@ class Context $oModuleModel = getModel('module'); $site_module_info = $oModuleModel->getDefaultMid() ?: new stdClass; self::set('site_module_info', $site_module_info); + self::set('_default_timezone', ($site_module_info->settings && $site_module_info->settings->timezone) ? $site_module_info->settings->timezone : null); self::set('_default_url', self::$_instance->db_info->default_url = self::getDefaultUrl($site_module_info)); self::set('_http_port', self::$_instance->db_info->http_port = $site_module_info->http_port ?: null); self::set('_https_port', self::$_instance->db_info->https_port = $site_module_info->https_port ?: null); diff --git a/common/framework/datetime.php b/common/framework/datetime.php index 66511d2ba..c4df3a7ea 100644 --- a/common/framework/datetime.php +++ b/common/framework/datetime.php @@ -66,6 +66,10 @@ class DateTime { return $_SESSION['RHYMIX']['timezone']; } + elseif ($default = \Context::get('_default_timezone')) + { + return $default; + } elseif ($default = Config::get('locale.default_timezone')) { return $default;