TPS
/
ORIENT
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Samuel Georges 2016-04-26 07:00:08 +10:00
parent d3efc1af4c
commit 94af417d8a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/backend/models/Preferences.php
View File

@ -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');