dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Make an apihelp message less repetitive"
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
FSRepo.php
diff --git
a/includes/filerepo/FSRepo.php
b/includes/filerepo/FSRepo.php
index
046b97c
..
5896aba
100644
(file)
--- a/
includes/filerepo/FSRepo.php
+++ b/
includes/filerepo/FSRepo.php
@@
-32,7
+32,7
@@
*/
class FSRepo extends FileRepo {
/**
*/
class FSRepo extends FileRepo {
/**
- * @param
$info array
+ * @param
array $info
* @throws MWException
*/
function __construct( array $info ) {
* @throws MWException
*/
function __construct( array $info ) {
@@
-56,7
+56,8
@@
class FSRepo extends FileRepo {
// Get the FS backend configuration
$backend = new FSFileBackend( array(
'name' => $info['name'] . '-backend',
// 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",
'containerPaths' => array(
"{$repoName}-public" => "{$directory}",
"{$repoName}-temp" => "{$directory}/temp",