From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Tue, 12 Jul 2011 23:52:43 +0000 (+0000)
Subject: Extend wfParseUrl() to handle protocol-relative URLs. parse_url() doesn't handle... 
X-Git-Tag: 1.31.0-rc.0~28889
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=df2306b971a21c7a7b33696f836beabe7961f1bf;p=lhc%2Fweb%2Fwiklou.git

Extend wfParseUrl() to handle protocol-relative URLs. parse_url() doesn't handle these either so it needs more workaround logic
---

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 63b621f184..12b130913a 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -478,14 +478,21 @@ function wfUrlProtocols() {
  * parse_url() work-alike, but non-broken.  Differences:
  *
  * 1) Does not raise warnings on bad URLs (just returns false)
- * 2) Handles protocols that don't use :// (e.g., mailto: and news:) correctly
- * 3) Adds a "delimiter" element to the array, either '://' or ':' (see (2))
+ * 2) Handles protocols that don't use :// (e.g., mailto: and news: , as well as protocol-relative URLs) correctly
+ * 3) Adds a "delimiter" element to the array, either '://', ':' or '//' (see (2))
  *
  * @param $url String: a URL to parse
  * @return Array: bits of the URL in an associative array, per PHP docs
  */
 function wfParseUrl( $url ) {
 	global $wgUrlProtocols; // Allow all protocols defined in DefaultSettings/LocalSettings.php
+	
+	// Protocol-relative URLs are handled really badly by parse_url(). It's so bad that the easiest
+	// way to handle them is to just prepend 'http:' and strip the protocol out later
+	$wasRelative = substr( $url, 0, 2 ) == '//';
+	if ( $wasRelative ) {
+		$url = "http:$url";
+	}
 	wfSuppressWarnings();
 	$bits = parse_url( $url );
 	wfRestoreWarnings();
@@ -517,6 +524,12 @@ function wfParseUrl( $url ) {
 			$bits['path'] = '/' . $bits['path'];
 		}
 	}
+	
+	// If the URL was protocol-relative, fix scheme and delimiter
+	if ( $wasRelative ) {
+		$bits['scheme'] = '';
+		$bits['delimiter'] = '//';
+	}
 	return $bits;
 }