From 96f3515eefa44743022cd326bd10d6c320dc5ec1 Mon Sep 17 00:00:00 2001
From: Kosta Harlan <kharlan@wikimedia.org>
Date: Wed, 1 May 2019 15:37:25 -0400
Subject: [PATCH] Use getInstanceForUpdate when saving user settings

Bug: T222300
Change-Id: Ia5e292bea544e5415ebcbbdd75705ee3b547e034
---
 includes/UniversalLanguageSelectorHooks.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/includes/UniversalLanguageSelectorHooks.php b/includes/UniversalLanguageSelectorHooks.php
index ded9f6ed..bfbe86da 100644
--- a/includes/UniversalLanguageSelectorHooks.php
+++ b/includes/UniversalLanguageSelectorHooks.php
@@ -248,11 +248,12 @@ class UniversalLanguageSelectorHooks {
 			// Language change
 			if ( Language::isSupportedLanguage( $languageToSave ) ) {
 				// Apply immediately
-				$user->setOption( 'language', $languageToSave );
+				$updateUser = $user->getInstanceForUpdate();
+				$updateUser->setOption( 'language', $languageToSave );
 				$code = $languageToSave;
 				// Promise to sync the DB on post-send
-				DeferredUpdates::addCallableUpdate( function () use ( $user ) {
-					$user->saveSettings();
+				DeferredUpdates::addCallableUpdate( function () use ( $updateUser ) {
+					$updateUser->saveSettings();
 				} );
 			}