Merge "Highlight new requirement"

[lhc/web/wiklou.git] / includes / resourceloader / ResourceLoaderFileModule.php

diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php
index 6924d31..1e7329a 100644 (file)
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -891,7 +891,7 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
                $localDir = dirname( $localPath );
                $remoteDir = dirname( $remotePath );
                // Get and register local file references
-               $localFileRefs = CSSMin::getAllLocalFileReferences( $style, $localDir );
+               $localFileRefs = CSSMin::getLocalFileReferences( $style, $localDir );
                foreach ( $localFileRefs as $file ) {
                        if ( file_exists( $file ) ) {
                                $this->localFileRefs[] = $file;
@@ -899,8 +899,9 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
                                $this->missingLocalFileRefs[] = $file;
                        }
                }
-               return MemoizedCallable::call( 'CSSMin::remap',
-                       [ $style, $localDir, $remoteDir, true ] );
+               // Don't cache this call. remap() ensures data URIs embeds are up to date,
+               // and urls contain correct content hashes in their query string. (T128668)
+               return CSSMin::remap( $style, $localDir, $remoteDir, true );
        }
 
        /**