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 "Add tests for WikiMap and WikiReference"
[lhc/web/wiklou.git]
/
includes
/
objectcache
/
MemcachedPhpBagOStuff.php
diff --git
a/includes/objectcache/MemcachedPhpBagOStuff.php
b/includes/objectcache/MemcachedPhpBagOStuff.php
index
939a715
..
6f0ba58
100644
(file)
--- a/
includes/objectcache/MemcachedPhpBagOStuff.php
+++ b/
includes/objectcache/MemcachedPhpBagOStuff.php
@@
-42,6
+42,7
@@
class MemcachedPhpBagOStuff extends MemcachedBagOStuff {
* @param array $params
*/
function __construct( $params ) {
* @param array $params
*/
function __construct( $params ) {
+ parent::__construct( $params );
$params = $this->applyDefaultParams( $params );
$this->client = new MemCachedClientforWiki( $params );
$params = $this->applyDefaultParams( $params );
$this->client = new MemCachedClientforWiki( $params );
@@
-56,13
+57,15
@@
class MemcachedPhpBagOStuff extends MemcachedBagOStuff {
$this->client->set_debug( $debug );
}
$this->client->set_debug( $debug );
}
- /**
- * @param array $keys
- * @return array
- */
- public function getMulti( array $keys ) {
+ public function getMulti( array $keys, $flags = 0 ) {
$callback = array( $this, 'encodeKey' );
$callback = array( $this, 'encodeKey' );
- return $this->client->get_multi( array_map( $callback, $keys ) );
+ $encodedResult = $this->client->get_multi( array_map( $callback, $keys ) );
+ $result = array();
+ foreach ( $encodedResult as $key => $value ) {
+ $key = $this->decodeKey( $key );
+ $result[$key] = $value;
+ }
+ return $result;
}
/**
}
/**