From 3635881b44a3b1069b1f44218fe6269cb2dfd3df Mon Sep 17 00:00:00 2001
From: Chad Horohoe <chadh@wikimedia.org>
Date: Tue, 13 Sep 2016 14:07:32 -0700
Subject: [PATCH] Avoid warnings when unable to parse the URL given to us

Change-Id: I56f1f36a3a54c6c23579f011d65dc75f30cb6dcf
---
 includes/MediaWiki.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 7f20de19d2..0bd183f1d0 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -648,7 +648,11 @@ class MediaWiki {
 		);
 
 		foreach ( $clusterHosts as $clusterHost ) {
-			$infoHost = array_intersect_key( wfParseUrl( $clusterHost ), $relevantKeys );
+			$parseUrl = wfParseUrl( $clusterHost );
+			if ( !$parseUrl ) {
+				continue;
+			}
+			$infoHost = array_intersect_key( $parseUrl, $relevantKeys );
 			if ( $infoCandidate === $infoHost ) {
 				return true;
 			}
-- 
2.20.1