[TikiWiki-commits] [Git][tikiwiki/tiki][master] [FIX] language: Preserve user-selected language when switching via tiki-switch_lang.php

Benoit Grégoire pushed to branch master at Tiki Wiki CMS Groupware / Tiki


Commits:
32aa9260 by Olivier Kango at 2026-02-12T13:49:08+00:00
[FIX] language: Preserve user-selected language when switching via tiki-switch_lang.php
---
* [FIX] language: Preserve user-selected language when switching via tiki-switch_lang.php

Remove comments

See merge request tikiwiki/tiki!9553

- - - - -


1 changed file:

- lib/language/Language.php


Changes:

=====================================
lib/language/Language.php
=====================================
@@ -779,7 +779,7 @@ class Language extends TikiDb_Bridge
         global $prefs;
 
         // Step 1: determine user language or fallback
-        $lang = self::determineUserLanguage() ?? $prefs['site_language'];
+        $lang = self::determineUserLanguage() ?? self::getCurrentLanguage();
 
         // Step 2: admin override
         $adminLang = self::determineAdminLanguage();



View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/32aa926070a0855db604ce55369ad11ec1764fe7

-- 
View it on GitLab: https://gitlab.com/tikiwiki/tiki/-/commit/32aa926070a0855db604ce55369ad11ec1764fe7
You're receiving this email because of your account on gitlab.com.

_______________________________________________
TikiWiki-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-cvs