Change language in SessionHandler::changeUser().

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 63390bf742e6c7353e0163e3c70e5ebca2190ee9..70074935029a707a132addbb7608a8524d1225d1 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -585,6 +585,8 @@ class WCF {
         * @param       integer         $languageID
         */
        public static final function setLanguage($languageID) {
+               if (!$languageID) $languageID = LanguageFactory::getInstance()->getDefaultLanguageID();
+               
                self::$languageObj = LanguageFactory::getInstance()->getLanguage($languageID);
                self::getTPL()->setLanguageID(self::getLanguage()->languageID);
        }

diff --git a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
index 8a00833981d55ca64085c03a1dcb4cfdb82d9b4e..fd0f7828f23bcd3caef586dec6e3d611d03e3fa0 100644 (file)
--- a/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
+++ b/wcfsetup/install/files/lib/system/session/SessionHandler.class.php
@@ -737,6 +737,9 @@ class SessionHandler extends SingletonFactory {
                $this->languageID = $this->user->languageID;
                $this->styleID = $this->user->styleID;
                
+               // change language
+               WCF::setLanguage($this->languageID ?: 0);
+               
                // in some cases the language id can be stuck in the session variables
                $this->unregister('languageID');