diff --git a/includes/ResourceLoader/SkinModule.php b/includes/ResourceLoader/SkinModule.php index 5fa6b77cc7d..5c1ba774e4e 100644 --- a/includes/ResourceLoader/SkinModule.php +++ b/includes/ResourceLoader/SkinModule.php @@ -357,8 +357,8 @@ class SkinModule extends LessVarFileModule { // The `content-links` feature was split out from `elements`. // Make sure skins asking for `elements` also get these by default. - if ( $addUnspecifiedFeatures && isset( $features[ 'element' ] ) && !isset( $features[ 'content-links' ] ) ) { - $features[ 'content-links' ] = $features[ 'element' ]; + if ( $addUnspecifiedFeatures && isset( $features[ 'elements' ] ) && !isset( $features[ 'content-links' ] ) ) { + $features[ 'content-links' ] = $features[ 'elements' ]; } // The interface module is a short hand for several modules. Enable them now. diff --git a/tests/phpunit/includes/ResourceLoader/SkinModuleTest.php b/tests/phpunit/includes/ResourceLoader/SkinModuleTest.php index 6951f28cce9..216b0852c81 100644 --- a/tests/phpunit/includes/ResourceLoader/SkinModuleTest.php +++ b/tests/phpunit/includes/ResourceLoader/SkinModuleTest.php @@ -58,12 +58,12 @@ class SkinModuleTest extends ResourceLoaderTestCase { ], true ], - 'element enables content-links if unset' => [ + 'elements enables content-links if unset' => [ [ - 'element' => true, + 'elements' => true, ], [ - 'element' => true, + 'elements' => true, 'content-links' => true, ], true