aboutsummaryrefslogtreecommitdiffstats
path: root/includes/resourceloader
diff options
context:
space:
mode:
Diffstat (limited to 'includes/resourceloader')
-rw-r--r--includes/resourceloader/ResourceLoaderFileModule.php16
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