From 6de7b6a87ec54e3ca4e91243487123256dbed74d Mon Sep 17 00:00:00 2001
From: Umherirrender <umherirrender_de.wp@web.de>
Date: Fri, 29 Apr 2022 21:00:40 +0200
Subject: htmlform: Replace deprecated User::getOption

Bug: T296083
Change-Id: I7f0e45ce7629d96d4ad38d32880b67da2d995de5
---
 includes/htmlform/fields/HTMLTextAreaField.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

(limited to 'includes/htmlform')

diff --git a/includes/htmlform/fields/HTMLTextAreaField.php b/includes/htmlform/fields/HTMLTextAreaField.php
index 44699922b7df..4c8be9009790 100644
--- a/includes/htmlform/fields/HTMLTextAreaField.php
+++ b/includes/htmlform/fields/HTMLTextAreaField.php
@@ -3,6 +3,9 @@
 /*
  * @stable to extend
  */
+
+use MediaWiki\MediaWikiServices;
+
 class HTMLTextAreaField extends HTMLFormField {
 	protected const DEFAULT_COLS = 80;
 	protected const DEFAULT_ROWS = 25;
@@ -68,13 +71,18 @@ class HTMLTextAreaField extends HTMLFormField {
 			array_push( $classes, $this->mClass );
 		}
 		if ( $this->mUseEditFont ) {
+			$userOptionsLookup = MediaWikiServices::getInstance()
+				->getUserOptionsLookup();
 			// The following classes can be used here:
 			// * mw-editfont-monospace
 			// * mw-editfont-sans-serif
 			// * mw-editfont-serif
 			array_push(
 				$classes,
-				'mw-editfont-' . $this->mParent->getUser()->getOption( 'editfont' )
+				'mw-editfont-' . $userOptionsLookup->getOption(
+					$this->mParent->getUser(),
+					'editfont'
+				)
 			);
 			$this->mParent->getOutput()->addModuleStyles( 'mediawiki.editfont.styles' );
 		}
@@ -114,13 +122,18 @@ class HTMLTextAreaField extends HTMLFormField {
 			array_push( $classes, $this->mClass );
 		}
 		if ( $this->mUseEditFont ) {
+			$userOptionsLookup = MediaWikiServices::getInstance()
+				->getUserOptionsLookup();
 			// The following classes can be used here:
 			// * mw-editfont-monospace
 			// * mw-editfont-sans-serif
 			// * mw-editfont-serif
 			array_push(
 				$classes,
-				'mw-editfont-' . $this->mParent->getUser()->getOption( 'editfont' )
+				'mw-editfont-' . $userOptionsLookup->getOption(
+					$this->mParent->getUser(),
+					'editfont'
+				)
 			);
 			$this->mParent->getOutput()->addModuleStyles( 'mediawiki.editfont.styles' );
 		}
-- 
cgit v1.2.3