openrat-cms

Unnamed repository; edit this file 'description' to name the repository.
Log | Files | Refs

commit 8ce7edd6c46dd563955d7c9bf25ffa9466f89d9c
parent 2939a23b624386e3c02adc9683ae754ee0b73e11
Author: Jan Dankert <devnull@localhost>
Date:   Sat, 13 Jan 2018 01:14:31 +0100

Fix: Lesen der Sprachdatei.

Diffstat:
modules/cms-core/action/LoginAction.class.php | 23+++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/modules/cms-core/action/LoginAction.class.php b/modules/cms-core/action/LoginAction.class.php @@ -1106,24 +1106,11 @@ class LoginAction extends Action $this->setStyle( $user->style ); // Benutzer-Style setzen - $langFile = OR_LANGUAGE_DIR.'lang-'.$user->language.'.'.PHP_EXT; - - // Pruefen, ob Sprache vorhanden ist. - if ( !file_exists( $langFile ) ) - { - // Nur Warnung ins Log schreiben, keinen Fehler werfen - // Es ist möglich, dass Sprachen entfernt werden. - Logger::warn("Languagefile $langFile does not exist."); - } - else - { - require( $langFile ); - global $conf; - $conf['language'] = $lang; - $conf['language']['language_code'] = $user->language; - Session::setConfig( $conf ); - } - + $config = Session::getConfig(); + $config['language'] = \language\Language::getLanguage($user->language); + $config['language']['language_code'] = $user->language; + Session::setConfig( $config ); + // Entscheiden, welche Perspektive als erstes angezeigt werden soll.