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

Merge "Fix preference namespace list to handle duplicates"

Browse source
This commit is contained in:
jenkins-bot 2016-06-30 16:29:48 +00:00 committed by Gerrit Code Review
parent d9d6a567d8 ea1a621c47
commit a95ffcdc42
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ApiVisualEditor.php
View file

@ -673,12 +673,12 @@ class ApiVisualEditor extends ApiBase {
// Note: existing numeric keys might exist, and so array_merge cannot be used
(array) $config->get( 'VisualEditorAvailableNamespaces' ) +
(array) ExtensionRegistry::getInstance()->getAttribute( 'VisualEditorAvailableNamespaces' );
return array_map( function ( $namespace ) {
return array_unique( array_map( function ( $namespace ) {
// Convert canonical namespace names to IDs
return is_numeric( $namespace ) ?
$namespace :
MWNamespace::getCanonicalIndex( strtolower( $namespace ) );
}, array_keys( array_filter( $availableNamespaces ) ) );
}, array_keys( array_filter( $availableNamespaces ) ) ) );
}
/**