Update FSRepo to avoid the deprecated FileBackend construction style

Change-Id: Iaa8d57e22750582eb95e4abab7444ff291807416

diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php
index edf0eec..5896aba 100644 (file)
--- a/includes/filerepo/FSRepo.php
+++ b/includes/filerepo/FSRepo.php
@@ -56,7 +56,8 @@ class FSRepo extends FileRepo {
                        // Get the FS backend configuration
                        $backend = new FSFileBackend( array(
                                'name' => $info['name'] . '-backend',
-                               'lockManager' => 'fsLockManager',
+                               'wikiId' => wfWikiID(),
+                               'lockManager' => LockManagerGroup::singleton( wfWikiID() )->get( 'fsLockManager' ),
                                'containerPaths' => array(
                                        "{$repoName}-public" => "{$directory}",
                                        "{$repoName}-temp" => "{$directory}/temp",