dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8fde6c3
)
Make sure getMulti() returns an array per the class interface
author
Aaron Schulz
<aschulz@wikimedia.org>
Wed, 3 Sep 2014 19:48:37 +0000
(12:48 -0700)
committer
BryanDavis
<bdavis@wikimedia.org>
Wed, 3 Sep 2014 20:17:28 +0000
(20:17 +0000)
Change-Id: Ic08f3ac37467a2743d7f8be5f5fb0032f84c3b82
includes/objectcache/MemcachedPeclBagOStuff.php
patch
|
blob
|
history
diff --git
a/includes/objectcache/MemcachedPeclBagOStuff.php
b/includes/objectcache/MemcachedPeclBagOStuff.php
index
8700c8c
..
c853bcf
100644
(file)
--- a/
includes/objectcache/MemcachedPeclBagOStuff.php
+++ b/
includes/objectcache/MemcachedPeclBagOStuff.php
@@
-247,6
+247,7
@@
class MemcachedPeclBagOStuff extends MemcachedBagOStuff {
$callback = array( $this, 'encodeKey' );
$result = $this->client->getMulti( array_map( $callback, $keys ) );
wfProfileOut( __METHOD__ );
+ $result = $result ?: array(); // must be an array
return $this->checkResult( false, $result );
}