From: Roan Kattouw <roan.kattouw@gmail.com>
Date: Fri, 6 May 2016 18:25:56 +0000 (-0700)
Subject: MemcachedClient: Always return an array from get_multi(), don't return false
X-Git-Tag: 1.31.0-rc.0~7069
X-Git-Url: http://git.heureux-cyclage.org/?a=commitdiff_plain;h=4b004068c072c6970b6db07fb7e4a6b487296bb4;p=lhc%2Fweb%2Fwiklou.git

MemcachedClient: Always return an array from get_multi(), don't return false

MemcachedPhpBagOStuff::getMulti() wraps around this method directly,
so get_multi() returning false was causing it to violate
BagOStuff's requirement that getMulti() always return an array.

Change-Id: Ia8f076323aed5b4a12de82d519eb530ed29d7060
---

diff --git a/includes/libs/objectcache/MemcachedClient.php b/includes/libs/objectcache/MemcachedClient.php
index 59322b676a..668135d070 100644
--- a/includes/libs/objectcache/MemcachedClient.php
+++ b/includes/libs/objectcache/MemcachedClient.php
@@ -487,7 +487,7 @@ class MemcachedClient {
 	 */
 	public function get_multi( $keys ) {
 		if ( !$this->_active ) {
-			return false;
+			return array();
 		}
 
 		if ( isset( $this->stats['get_multi'] ) ) {