summaryrefslogtreecommitdiff
path: root/includes/filerepo/FSRepo.php
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2014-12-27 15:41:37 +0100
committerPierre Schmitz <pierre@archlinux.de>2014-12-31 11:43:28 +0100
commitc1f9b1f7b1b77776192048005dcc66dcf3df2bfb (patch)
tree2b38796e738dd74cb42ecd9bfd151803108386bc /includes/filerepo/FSRepo.php
parentb88ab0086858470dd1f644e64cb4e4f62bb2be9b (diff)
Update to MediaWiki 1.24.1
Diffstat (limited to 'includes/filerepo/FSRepo.php')
-rw-r--r--includes/filerepo/FSRepo.php6
1 files changed, 3 insertions, 3 deletions
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",