LocalisationCache: Don't instantiate ResourceLoader

[lhc/web/wiklou.git] / includes / ServiceWiring.php

diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index e83f625..a106157 100644 (file)
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -109,8 +109,7 @@ return [
                        $services->getExternalStoreAccess(),
                        $services->getMainWANObjectCache(),
                        new ServiceOptions( BlobStoreFactory::CONSTRUCTOR_OPTIONS,
-                               $services->getMainConfig() ),
-                       $services->getContentLanguage()
+                               $services->getMainConfig() )
                );
        },
 
@@ -320,7 +319,10 @@ return [
                        $store,
                        $logger,
                        [ function () use ( $services ) {
-                               $services->getResourceLoader()->getMessageBlobStore()->clear();
+                               // NOTE: Make sure we use the same cache object that is assigned in the
+                               // constructor of the MessageBlobStore class used by ResourceLoader.
+                               // T231866: Avoid circular dependency via ResourceLoader.
+                               MessageBlobStore::clearGlobalCacheEntry( $services->getMainWANObjectCache() );
                        } ],
                        $services->getLanguageNameUtils()
                );