From ccd177ada6823c27a6408427f19c238fd701c39e Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Wed, 6 Dec 2017 16:19:11 -0800
Subject: Store PHP sessions in the database

---
 app/Model/LanguageModel.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'app/Model/LanguageModel.php')

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');
     }
 
     /**
-- 
cgit v1.2.3