Stop calling FileRepo->streamFile()

[lhc/web/wiklou.git] / includes / filebackend / FileBackendGroup.php

diff --git a/includes/filebackend/FileBackendGroup.php b/includes/filebackend/FileBackendGroup.php
index a091608..a5860e2 100644 (file)
--- a/includes/filebackend/FileBackendGroup.php
+++ b/includes/filebackend/FileBackendGroup.php
@@ -178,9 +178,15 @@ class FileBackendGroup {
 
                $config = $this->backends[$name]['config'];
                $config['class'] = $class;
-               $config += [ // set defaults
+               if ( isset( $config['domainId'] ) ) {
+                       $domain = $config['domainId'];
+               } else {
                        // @FIXME: this does not include the domain for b/c but it ideally should
-                       'wikiId' => wfWikiID(), // e.g. "my_wiki-en_"
+                       $domain = $config['wikiId'] ?? wfWikiID();
+               }
+               // Set default parameter values
+               $config += [
+                       'domainId' => $domain, // e.g. "my_wiki-en_"
                        'mimeCallback' => [ $this, 'guessMimeInternal' ],
                        'obResetFunc' => 'wfResetOutputBuffers',
                        'streamMimeFunc' => [ StreamFile::class, 'contentTypeFromPath' ],
@@ -194,7 +200,7 @@ class FileBackendGroup {
                        }
                ];
                $config['lockManager'] =
-                       LockManagerGroup::singleton( $config['wikiId'] )->get( $config['lockManager'] );
+                       LockManagerGroup::singleton( $domain )->get( $config['lockManager'] );
                $config['fileJournal'] = isset( $config['fileJournal'] )
                        ? FileJournal::factory( $config['fileJournal'], $name )
                        : FileJournal::factory( [ 'class' => NullFileJournal::class ], $name );