Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / filerepo / FSRepo.php

diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php
index edf0eec..b24354d 100644 (file)
--- a/includes/filerepo/FSRepo.php
+++ b/includes/filerepo/FSRepo.php
@@ -54,18 +54,19 @@ class FSRepo extends FileRepo {
 
                        $repoName = $info['name'];
                        // Get the FS backend configuration
-                       $backend = new FSFileBackend( array(
+                       $backend = new FSFileBackend( [
                                'name' => $info['name'] . '-backend',
-                               'lockManager' => 'fsLockManager',
-                               'containerPaths' => array(
+                               'wikiId' => wfWikiID(),
+                               'lockManager' => LockManagerGroup::singleton( wfWikiID() )->get( 'fsLockManager' ),
+                               'containerPaths' => [
                                        "{$repoName}-public" => "{$directory}",
                                        "{$repoName}-temp" => "{$directory}/temp",
                                        "{$repoName}-thumb" => $thumbDir,
                                        "{$repoName}-transcoded" => $transcodedDir,
                                        "{$repoName}-deleted" => $deletedDir
-                               ),
+                               ],
                                'fileMode' => $fileMode,
-                       ) );
+                       ] );
                        // Update repo config to use this backend
                        $info['backend'] = $backend;
                }