diff options
author | jenkins-bot <jenkins-bot@gerrit.wikimedia.org> | 2022-08-05 01:13:13 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@wikimedia.org> | 2022-08-05 01:13:13 +0000 |
commit | 89bc58d94e2032aa6f01500733709c6045d5beeb (patch) | |
tree | 46a63791828d773df521a784b63f22e8feb5551f /includes/htmlform | |
parent | 7d2090508d47d79f4c11eb618bbfa15dc295492a (diff) | |
parent | 6de7b6a87ec54e3ca4e91243487123256dbed74d (diff) | |
download | mediawikicore-89bc58d94e2032aa6f01500733709c6045d5beeb.tar.gz mediawikicore-89bc58d94e2032aa6f01500733709c6045d5beeb.zip |
Merge "htmlform: Replace deprecated User::getOption"
Diffstat (limited to 'includes/htmlform')
-rw-r--r-- | includes/htmlform/fields/HTMLTextAreaField.php | 17 |
1 files changed, 15 insertions, 2 deletions
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' ); } |