From 72c8cdb40b28a749219453a0b99e14236fb88e78 Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Sun, 28 Nov 2021 15:01:06 +0100
Subject: [PATCH] Use User object in UserGetLanguageObject hook only when safe
 to load

In case of error formatting the context language may set up before the
Setup.php is ended.

Bug: T267445
Change-Id: I4f07b30f75922884867bd14d654effc0e26a47f4
---
 includes/UniversalLanguageSelectorHooks.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/includes/UniversalLanguageSelectorHooks.php b/includes/UniversalLanguageSelectorHooks.php
index 36521e07..c4f6fee3 100644
--- a/includes/UniversalLanguageSelectorHooks.php
+++ b/includes/UniversalLanguageSelectorHooks.php
@@ -339,8 +339,8 @@ class UniversalLanguageSelectorHooks implements
 		if (
 			// uselang can be used for temporary override of language preference
 			$request->getText( 'uselang' ) ||
-			// Registered user: use preferences
-			!$user->isAnon()
+			// Registered user: use preferences, only when safe to load - T267445
+			( $user->isSafeToLoad() && $user->isRegistered() )
 		) {
 			return;
 		}