wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-24 02:38:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid using User::IsIP

Browse source 
Remove using of User::isIP since this method will be hard-deprecated. Now it is soft-deprecated

Bug: T275602
Change-Id: Ia625be523706d1e24649f7aa15679491f9598b7f
This commit is contained in:
vladshapik 2021-02-24 17:17:04 +02:00
parent 718d93f862
commit 3d29dd25e9
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
extension.json
View file

@ -173,7 +173,12 @@
}
},
"APIModules": {
"visualeditor": "ApiVisualEditor",
"visualeditor": {
"class": "ApiVisualEditor",
"services": [
"UserNameUtils"
]
},
"visualeditoredit": "ApiVisualEditorEdit"
},
"MessagesDirs": {

13
includes/ApiVisualEditor.php
View file

@ -12,18 +12,25 @@ use MediaWiki\Block\DatabaseBlock;
use MediaWiki\Logger\LoggerFactory;
use MediaWiki\MediaWikiServices;
use MediaWiki\Revision\RevisionRecord;
use MediaWiki\User\UserNameUtils;
use Wikimedia\ParamValidator\ParamValidator;
class ApiVisualEditor extends ApiBase {
use ApiBlockInfoTrait;
use ApiParsoidTrait;
/** @var UserNameUtils */
private $userNameUtils;
/**
* @inheritDoc
* @param ApiMain $main
* @param string $name
* @param UserNameUtils $userNameUtils
*/
public function __construct( ApiMain $main, $name ) {
public function __construct( ApiMain $main, $name, UserNameUtils $userNameUtils ) {
parent::__construct( $main, $name );
$this->setLogger( LoggerFactory::getInstance( 'VisualEditor' ) );
$this->userNameUtils = $userNameUtils;
}
/**
@ -391,7 +398,7 @@ class ApiVisualEditor extends ApiBase {
if (
!( $targetUser && $targetUser->isRegistered() ) &&
!User::isIP( $targetUsername )
!$this->userNameUtils->isIP( $targetUsername )
) {
// User does not exist
$notices['userpage-userdoesnotexist'] = "<div class=\"mw-userpage-userdoesnotexist error\">\n" .