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 "autocomplete: fix duplicate/missing tracking events"
[lhc/web/wiklou.git]
/
includes
/
libs
/
objectcache
/
ReplicatedBagOStuff.php
diff --git
a/includes/libs/objectcache/ReplicatedBagOStuff.php
b/includes/libs/objectcache/ReplicatedBagOStuff.php
index
40ac1bb
..
5f2c509
100644
(file)
--- a/
includes/libs/objectcache/ReplicatedBagOStuff.php
+++ b/
includes/libs/objectcache/ReplicatedBagOStuff.php
@@
-112,7
+112,7
@@
class ReplicatedBagOStuff extends BagOStuff {
return $this->writeStore->unlock( $key );
}
return $this->writeStore->unlock( $key );
}
- public function merge( $key, $callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
+ public function merge( $key,
callable
$callback, $exptime = 0, $attempts = 10, $flags = 0 ) {
return $this->writeStore->merge( $key, $callback, $exptime, $attempts, $flags );
}
return $this->writeStore->merge( $key, $callback, $exptime, $attempts, $flags );
}