From: Sam Reed <reedy@users.mediawiki.org>
Date: Sat, 11 Feb 2012 15:13:01 +0000 (+0000)
Subject: Followup r11120, wfParseUrl() can return false, if it does, the host isn't going... 
X-Git-Tag: 1.31.0-rc.0~24774
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=4ee96a4a4b19f40397f9ae59f481516278231ac1;p=lhc%2Fweb%2Fwiklou.git

Followup r11120, wfParseUrl() can return false, if it does, the host isn't going to be valid
---

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;