diff options
| author | Arlo Breault <abreault@wikimedia.org> | 2021-08-25 17:46:00 -0400 |
|---|---|---|
| committer | Krinkle <krinklemail@gmail.com> | 2021-09-02 17:51:10 +0000 |
| commit | f07e73dd9a19e21c2bcdf33a3da84240a5bbba3d (patch) | |
| tree | 0fee2879002fe5586bc187e5c567729566a12df9 /includes/resourceloader/ResourceLoaderFileModule.php | |
| parent | 073c90e176dad28d2fcd7609728bb4ba99d038fc (diff) | |
| download | mediawikicore-f07e73dd9a19e21c2bcdf33a3da84240a5bbba3d.tar.gz mediawikicore-f07e73dd9a19e21c2bcdf33a3da84240a5bbba3d.zip | |
resourceloader: Call getStyleFiles from FileModule::getFileHashes
ResourceLoaderFileModule::getFileHashes had its own code to collect
style files that omitted the feature files that ResourceLoaderSkinModule
adds. This deduplication should fix the issue where
wgParserEnableLegacyMediaDOM was adding an additional feature file but
didn't seem to be invalidating the cache.
Bug: T51097
Bug: T290273
Change-Id: I50cf73a79cb1ce2b3d80510e80948e3e6fc1791b
Diffstat (limited to 'includes/resourceloader/ResourceLoaderFileModule.php')
| -rw-r--r-- | includes/resourceloader/ResourceLoaderFileModule.php | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php index 7fd7c1305431..ed50b6867544 100644 --- a/includes/resourceloader/ResourceLoaderFileModule.php +++ b/includes/resourceloader/ResourceLoaderFileModule.php @@ -544,19 +544,9 @@ class ResourceLoaderFileModule extends ResourceLoaderModule { private function getFileHashes( ResourceLoaderContext $context ) { $files = []; - // Flatten style files into $files - $styles = self::collateFilePathListByOption( $this->styles, 'media', 'all' ); - foreach ( $styles as $styleFiles ) { - $files = array_merge( $files, $styleFiles ); - } - - $skinFiles = self::collateFilePathListByOption( - self::tryForKey( $this->skinStyles, $context->getSkin(), 'default' ), - 'media', - 'all' - ); - foreach ( $skinFiles as $styleFiles ) { - $files = array_merge( $files, $styleFiles ); + $styleFiles = $this->getStyleFiles( $context ); + foreach ( $styleFiles as $paths ) { + $files = array_merge( $files, $paths ); } // Extract file paths for package files |