wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-12-11 05:56:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Remove usages of deprecated MWNamespace."

Browse source
This commit is contained in:
jenkins-bot 2019-08-27 15:41:04 +00:00 committed by Gerrit Code Review
parent 624bcbaf72 c0d2d52e95
commit aa3f94e5ca
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/ApiVisualEditor.php
View file

@ -443,7 +443,9 @@ class ApiVisualEditor extends ApiBase {
// Look at protection status to set up notices + surface class(es) // Look at protection status to set up notices + surface class(es)
$protectedClasses = []; $protectedClasses = [];
if ( MWNamespace::getRestrictionLevels( $title->getNamespace() ) !== [ '' ] ) { if ( MediaWikiServices::getInstance()->getPermissionManager()
->getNamespaceRestrictionLevels( $title->getNamespace() ) !== [ '' ]
) {
// Page protected from editing // Page protected from editing
if ( $title->isProtected( 'edit' ) ) { if ( $title->isProtected( 'edit' ) ) {
// Is the title semi-protected? // Is the title semi-protected?
@ -688,12 +690,13 @@ class ApiVisualEditor extends ApiBase {
(array)ExtensionRegistry::getInstance()->getAttribute( 'VisualEditorAvailableNamespaces' ); (array)ExtensionRegistry::getInstance()->getAttribute( 'VisualEditorAvailableNamespaces' );
return array_values( array_unique( array_map( function ( $namespace ) { return array_values( array_unique( array_map( function ( $namespace ) {
// Convert canonical namespace names to IDs // Convert canonical namespace names to IDs
$idFromName = MWNamespace::getCanonicalIndex( strtolower( $namespace ) ); $nsInfo = MediaWikiServices::getInstance()->getNamespaceInfo();
$idFromName = $nsInfo->getCanonicalIndex( strtolower( $namespace ) );
if ( $idFromName !== null ) { if ( $idFromName !== null ) {
return $idFromName; return $idFromName;
} }
// Allow namespaces to be specified by ID as well // Allow namespaces to be specified by ID as well
return MWNamespace::exists( $namespace ) ? $namespace : null; return $nsInfo->exists( $namespace ) ? $namespace : null;
}, array_keys( array_filter( $availableNamespaces ) ) ) ) ); }, array_keys( array_filter( $availableNamespaces ) ) ) ) );
} }