diff options
| author | Frédéric Guillot <fred@kanboard.net> | 2017-12-06 16:19:11 -0800 |
|---|---|---|
| committer | Frédéric Guillot <fguillot@apple.com> | 2017-12-12 15:04:28 -0800 |
| commit | ccd177ada6823c27a6408427f19c238fd701c39e (patch) | |
| tree | 9846c792bd4c4f9318768f00db0e8f00cc25954b /app/Model | |
| parent | 421531bd4f0af6a26e0b7971e23d5af1d5cf7d05 (diff) | |
Store PHP sessions in the database
Diffstat (limited to 'app/Model')
| -rw-r--r-- | app/Model/LanguageModel.php | 6 | ||||
| -rw-r--r-- | app/Model/TimezoneModel.php | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/app/Model/LanguageModel.php b/app/Model/LanguageModel.php index 6d46a2fa..09893690 100644 --- a/app/Model/LanguageModel.php +++ b/app/Model/LanguageModel.php @@ -174,11 +174,7 @@ class LanguageModel extends Base */ public function getCurrentLanguage() { - if ($this->userSession->isLogged() && ! empty($this->sessionStorage->user['language'])) { - return $this->sessionStorage->user['language']; - } - - return $this->configModel->get('application_language', 'en_US'); + return $this->userSession->getLanguage() ?: $this->configModel->get('application_language', 'en_US'); } /** diff --git a/app/Model/TimezoneModel.php b/app/Model/TimezoneModel.php index 8b3e895a..ef6afc6a 100644 --- a/app/Model/TimezoneModel.php +++ b/app/Model/TimezoneModel.php @@ -39,11 +39,7 @@ class TimezoneModel extends Base */ public function getCurrentTimezone() { - if ($this->userSession->isLogged() && ! empty($this->sessionStorage->user['timezone'])) { - return $this->sessionStorage->user['timezone']; - } - - return $this->configModel->get('application_timezone', 'UTC'); + return $this->userSession->getTimezone() ?: $this->configModel->get('application_timezone', 'UTC'); } /** |