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 "Don't fallback from uk to ru"
[lhc/web/wiklou.git]
/
includes
/
libs
/
objectcache
/
ReplicatedBagOStuff.php
diff --git
a/includes/libs/objectcache/ReplicatedBagOStuff.php
b/includes/libs/objectcache/ReplicatedBagOStuff.php
index
ad811c7
..
3bc7ae2
100644
(file)
--- a/
includes/libs/objectcache/ReplicatedBagOStuff.php
+++ b/
includes/libs/objectcache/ReplicatedBagOStuff.php
@@
-59,12
+59,13
@@
class ReplicatedBagOStuff extends BagOStuff {
__METHOD__ . ': the "readFactory" parameter is required' );
}
__METHOD__ . ': the "readFactory" parameter is required' );
}
+ $opts = [ 'reportDupes' => false ]; // redundant
$this->writeStore = ( $params['writeFactory'] instanceof BagOStuff )
? $params['writeFactory']
$this->writeStore = ( $params['writeFactory'] instanceof BagOStuff )
? $params['writeFactory']
- : ObjectFactory::getObjectFromSpec( $params['writeFactory'] );
+ : ObjectFactory::getObjectFromSpec( $
opts + $
params['writeFactory'] );
$this->readStore = ( $params['readFactory'] instanceof BagOStuff )
? $params['readFactory']
$this->readStore = ( $params['readFactory'] instanceof BagOStuff )
? $params['readFactory']
- : ObjectFactory::getObjectFromSpec( $params['readFactory'] );
+ : ObjectFactory::getObjectFromSpec( $
opts + $
params['readFactory'] );
$this->attrMap = $this->mergeFlagMaps( [ $this->readStore, $this->writeStore ] );
}
$this->attrMap = $this->mergeFlagMaps( [ $this->readStore, $this->writeStore ] );
}