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 "Http::getProxy() method to get proxy configuration"
[lhc/web/wiklou.git]
/
includes
/
libs
/
objectcache
/
EmptyBagOStuff.php
diff --git
a/includes/libs/objectcache/EmptyBagOStuff.php
b/includes/libs/objectcache/EmptyBagOStuff.php
index
4ccf270
..
4321b25
100644
(file)
--- a/
includes/libs/objectcache/EmptyBagOStuff.php
+++ b/
includes/libs/objectcache/EmptyBagOStuff.php
@@
-27,11
+27,11
@@
* @ingroup Cache
*/
class EmptyBagOStuff extends BagOStuff {
* @ingroup Cache
*/
class EmptyBagOStuff extends BagOStuff {
- p
ublic function get( $key, &$casToken = null
) {
+ p
rotected function doGet( $key, $flags = 0
) {
return false;
}
return false;
}
- public function set( $key, $value, $exp = 0 ) {
+ public function set( $key, $value, $exp = 0
, $flags = 0
) {
return true;
}
return true;
}
@@
-39,7
+39,7
@@
class EmptyBagOStuff extends BagOStuff {
return true;
}
return true;
}
- public function merge( $key, $callback, $exptime = 0, $attempts = 10 ) {
+ public function merge( $key, $callback, $exptime = 0, $attempts = 10
, $flags = 0
) {
return true; // faster
}
}
return true; // faster
}
}