From 8350329922370a107aa069e8d5b52918801b661a Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 18 Apr 2018 21:38:47 -0700 Subject: [PATCH] Avoid warnings in ObjectCache::newWANCacheFromParams if "channels" is not set" Bug: T192473 Change-Id: I150eef62285e99fc1269a58fee3827e5fbb0537b --- includes/objectcache/ObjectCache.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php index 67d2346013..a6f55e6026 100644 --- a/includes/objectcache/ObjectCache.php +++ b/includes/objectcache/ObjectCache.php @@ -337,9 +337,11 @@ class ObjectCache { $services = MediaWikiServices::getInstance(); $erGroup = $services->getEventRelayerGroup(); - foreach ( $params['channels'] as $action => $channel ) { - $params['relayers'][$action] = $erGroup->getRelayer( $channel ); - $params['channels'][$action] = $channel; + if ( isset( $params['channels'] ) ) { + foreach ( $params['channels'] as $action => $channel ) { + $params['relayers'][$action] = $erGroup->getRelayer( $channel ); + $params['channels'][$action] = $channel; + } } $params['cache'] = self::newFromParams( $params['store'] ); if ( isset( $params['loggroup'] ) ) { -- 2.20.1