Merge branch 'mw-1.26'

1 files changed, 8 insertions, 6 deletions

diff --git a/includes/objectcache/MemcachedPhpBagOStuff.php b/includes/objectcache/MemcachedPhpBagOStuff.php
index 6fba61ba..6f0ba588 100644
--- a/includes/objectcache/MemcachedPhpBagOStuff.php
+++ b/includes/objectcache/MemcachedPhpBagOStuff.php
@@ -57,13 +57,15 @@ class MemcachedPhpBagOStuff extends MemcachedBagOStuff {
 		$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' );
-		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;
 	}
 
 	/**