From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 10 Dec 2013 22:29:06 +0000 (-0800)
Subject: Update FSRepo to avoid the deprecated FileBackend construction style
X-Git-Tag: 1.31.0-rc.0~17655
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/modifier.php?a=commitdiff_plain;h=9835eeaec0116c10cc4c643a0e6d2393ec25f251;p=lhc%2Fweb%2Fwiklou.git

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 edf0eec463..5896aba1ae 100644
--- 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",