From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 includes/filerepo/FSRepo.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'includes/filerepo/FSRepo.php')

diff --git a/includes/filerepo/FSRepo.php b/includes/filerepo/FSRepo.php
index 42c9c945..5896aba1 100644
--- a/includes/filerepo/FSRepo.php
+++ b/includes/filerepo/FSRepo.php
@@ -31,9 +31,8 @@
  * @deprecated since 1.19
  */
 class FSRepo extends FileRepo {
-
 	/**
-	 * @param $info array
+	 * @param array $info
 	 * @throws MWException
 	 */
 	function __construct( array $info ) {
@@ -57,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",
-- 
cgit v1.2.2