From 4ee96a4a4b19f40397f9ae59f481516278231ac1 Mon Sep 17 00:00:00 2001
From: Sam Reed <reedy@users.mediawiki.org>
Date: Sat, 11 Feb 2012 15:13:01 +0000
Subject: [PATCH] Followup r11120, wfParseUrl() can return false, if it does,
 the host isn't going to be valid

---
 includes/upload/UploadFromUrl.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/includes/upload/UploadFromUrl.php b/includes/upload/UploadFromUrl.php
index 13b0e14ecd..0ae8a22c22 100644
--- a/includes/upload/UploadFromUrl.php
+++ b/includes/upload/UploadFromUrl.php
@@ -47,8 +47,11 @@ class UploadFromUrl extends UploadBase {
 		if ( !count( $wgCopyUploadsDomains ) ) {
 			return true;
 		}
-		$valid = false;
 		$parsedUrl = wfParseUrl( $url );
+		if ( !$parsedUrl ) {
+			return false;
+		}
+		$valid = false;
 		foreach( $wgCopyUploadsDomains as $domain ) {
 			if ( $parsedUrl['host'] === $domain ) {
 				$valid = true;
-- 
2.20.1