diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-01 15:12:12 -0400 |
| commit | c9aa36da061816dee256a979c2ff8d2ee41824d9 (patch) | |
| tree | 29f7002b80ee984b488bd047dbbd80b36bf892e9 /includes/filerepo/FSRepo.php | |
| parent | b4274e0e33eafb5e9ead9d949ebf031a9fb8363b (diff) | |
| parent | d1ba966140d7a60cd5ae4e8667ceb27c1a138592 (diff) | |
Merge branch 'archwiki'
# Conflicts:
# skins/ArchLinux.php
# skins/ArchLinux/archlogo.gif
Diffstat (limited to 'includes/filerepo/FSRepo.php')
| -rw-r--r-- | includes/filerepo/FSRepo.php | 6 |
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", |