Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ResourceLoader: Fix content-links compat

Browse source 
This never worked because it looked for `element` instead of `elements`.
The test repeated the same mistake.

Bug: T278576
Bug: T255717
Change-Id: I9bfceb6b8bd761244af6eda0e2ae08e98238aa76
This commit is contained in:
Timo Tijhof 2024-09-09 13:39:11 -07:00 committed by Krinkle
parent 123da635a1
commit e03380c714
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/ResourceLoader/SkinModule.php
View file

@ -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.

6
tests/phpunit/includes/ResourceLoader/SkinModuleTest.php
View file

@ -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