From 94af417d8af368ffd585be4ef70c9e509673e770 Mon Sep 17 00:00:00 2001 From: Samuel Georges Date: Tue, 26 Apr 2016 07:00:08 +1000 Subject: [PATCH] Set default backend timezone to app value Consider that some users may have already set app.timezone to their local timezone, so we don't want these values converted back to UTC --- modules/backend/models/Preferences.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/backend/models/Preferences.php b/modules/backend/models/Preferences.php index c0c7cedd8..2c51256a4 100644 --- a/modules/backend/models/Preferences.php +++ b/modules/backend/models/Preferences.php @@ -34,11 +34,11 @@ class Preferences extends Model public function initSettingsData() { - $this->locale = Config::get('app.locale', 'en'); - $this->fallback_locale = $this->getFallbackLocale($this->locale); - $this->timezone = Config::get('cms.backendTimezone', 'UTC'); - $config = App::make('config'); + $this->locale = $config->get('app.locale', 'en'); + $this->fallback_locale = $this->getFallbackLocale($this->locale); + $this->timezone = $config->get('cms.backendTimezone', $config->get('app.timezone')); + $this->editor_font_size = $config->get('editor.font_size', 12); $this->editor_word_wrap = $config->get('editor.word_wrap', 'fluid'); $this->editor_code_folding = $config->get('editor.code_folding', 'manual');