bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid using User::setOption()

Browse Source 
User::setOption() is deprecated and should be replaced with
UserOptionsManager::setOption()

Bug: T277818
Change-Id: I5ac58c4be5046d4457de24b63b062aa238e972b6
This commit is contained in:
Alexander Vorwerk
2021-08-12 00:25:32 +02:00
committed by jenkins-bot
parent 77b61af6b8
commit 0d9e1b134a
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
extension.json
View File

@@ -33,7 +33,12 @@
"APIModules": {
"languagesearch": "ApiLanguageSearch",
"ulslocalization": "ApiULSLocalization",
"ulssetlang": "ApiULSSetLanguage"
"ulssetlang": {
"class": "ApiULSSetLanguage",
"services": [
"UserOptionsManager"
]
}
},
"MessagesDirs": {
"UniversalLanguageSelector": [

21
includes/api/ApiULSSetLanguage.php
View File

@@ -18,10 +18,29 @@
* @license MIT
*/
use MediaWiki\User\UserOptionsManager;
/**
* @ingroup API
*/
class ApiULSSetLanguage extends ApiBase {
/** @var UserOptionsManager */
private $userOptionsManager;
/**
* @param ApiMain $main
* @param string $action
* @param UserOptionsManager $userOptionsManager
*/
public function __construct(
ApiMain $main,
$action,
UserOptionsManager $userOptionsManager
) {
parent::__construct( $main, $action );
$this->userOptionsManager = $userOptionsManager;
}
public function execute() {
$request = $this->getRequest();
if ( !$request->wasPosted() ) {
@@ -53,7 +72,7 @@ class ApiULSSetLanguage extends ApiBase {
}
$updateUser = $user->getInstanceForUpdate();
$updateUser->setOption( 'language', $languageCode );
$this->userOptionsManager->setOption( $updateUser, 'language', $languageCode );
// Sync the DB on post-send
DeferredUpdates::addCallableUpdate( static function () use ( $updateUser ) {
$updateUser->saveSettings();

6
maintenance/ULSCompactLinksDisablePref.php
View File

@@ -34,7 +34,9 @@ class ULSCompactLinksDisablePref extends Maintenance {
public function execute() {
$dbr = wfGetDB( DB_REPLICA, 'vslow' );
$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
$services = MediaWikiServices::getInstance();
$lbFactory = $services->getDBLoadBalancerFactory();
$userOptionsManager = $services->getUserOptionsManager();
$really = $this->hasOption( 'really' );
@@ -102,7 +104,7 @@ class ULSCompactLinksDisablePref extends Maintenance {
$user->load( User::READ_LATEST );
if ( $really ) {
$user->setOption( 'compact-language-links', 0 );
$userOptionsManager->setOption( $user, 'compact-language-links', 0 );
$user->saveSettings();
}