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 "docs: Ignore extensions/ and skins/ in mwdocgen.php by default"
[lhc/web/wiklou.git]
/
includes
/
filerepo
/
ForeignDBRepo.php
diff --git
a/includes/filerepo/ForeignDBRepo.php
b/includes/filerepo/ForeignDBRepo.php
index
7879448
..
a44d3ed
100644
(file)
--- a/
includes/filerepo/ForeignDBRepo.php
+++ b/
includes/filerepo/ForeignDBRepo.php
@@
-107,8
+107,7
@@
class ForeignDBRepo extends LocalRepo {
'password' => $this->dbPassword,
'dbname' => $this->dbName,
'flags' => $this->dbFlags,
'password' => $this->dbPassword,
'dbname' => $this->dbName,
'flags' => $this->dbFlags,
- 'tablePrefix' => $this->tablePrefix,
- 'foreign' => true,
+ 'tablePrefix' => $this->tablePrefix
];
return function ( $index ) use ( $type, $params ) {
];
return function ( $index ) use ( $type, $params ) {
@@
-132,9
+131,8
@@
class ForeignDBRepo extends LocalRepo {
function getSharedCacheKey( /*...*/ ) {
if ( $this->hasSharedCache() ) {
$args = func_get_args();
function getSharedCacheKey( /*...*/ ) {
if ( $this->hasSharedCache() ) {
$args = func_get_args();
- array_unshift( $args, $this->dbName, $this->tablePrefix );
- return
call_user_func_array( 'wfForeignMemcKey',
$args );
+ return
wfForeignMemcKey( $this->dbName, $this->tablePrefix, ...
$args );
} else {
return false;
}
} else {
return false;
}