http://www.mediawiki.org/wiki/Special:Code/MediaWiki/89452
Revision: 89452
Author: mah
Date: 2011-06-04 02:59:10 +0000 (Sat, 04 Jun 2011)
Log Message:
-----------
follow up r89278 ?\226?\128?\148 remove FTP support.
Modified Paths:
--------------
trunk/phase3/includes/HttpFunctions.php
Modified: trunk/phase3/includes/HttpFunctions.php
===================================================================
--- trunk/phase3/includes/HttpFunctions.php 2011-06-04 02:54:29 UTC (rev
89451)
+++ trunk/phase3/includes/HttpFunctions.php 2011-06-04 02:59:10 UTC (rev
89452)
@@ -126,14 +126,13 @@
* 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 @@
}
if ( $this->parsedUrl['scheme'] != 'http' &&
- $this->parsedUrl['scheme'] != 'ftp' &&
$this->parsedUrl['scheme'] != 'https' ) {
$this->status->fatal( 'http-invalid-scheme',
$this->parsedUrl['scheme'] );
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
