From: Mark A. Hershberger <mah@users.mediawiki.org>
Date: Sat, 4 Jun 2011 02:59:10 +0000 (+0000)
Subject: follow up r89278 — remove FTP support.
X-Git-Tag: 1.31.0-rc.0~29725
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=20d5ed9326d17966938a8e428df0c880179c3dc7;p=lhc%2Fweb%2Fwiklou.git

follow up r89278 — remove FTP support.
---

diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 75dbbdf37c..bac062fd5c 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -126,14 +126,13 @@ class Http {
 	 * and php support.
 	 *
 	 * @fixme this is wildly inaccurate and fails to actually check most stuff
-	 * @fixme do we actually intend to have FTP support here? Does it work consistently?
 	 *
 	 * @param $uri Mixed: URI to check for validity
 	 * @returns Boolean
 	 */
 	public static function isValidURI( $uri ) {
 		return preg_match(
-			'/^(f|ht)tps?:\/\/[^\/\s]\S*$/D',
+			'/^https?:\/\/[^\/\s]\S*$/D',
 			$uri
 		);
 	}
@@ -717,7 +716,6 @@ class PhpHttpRequest extends MWHttpRequest {
 		}
 
 		if ( $this->parsedUrl['scheme'] != 'http' &&
-			 $this->parsedUrl['scheme'] != 'ftp' &&
 			 $this->parsedUrl['scheme'] != 'https' ) {
 			$this->status->fatal( 'http-invalid-scheme', $this->parsedUrl['scheme'] );
 		}