From: Daniel Friesen <dantman@users.mediawiki.org>
Date: Sun, 14 Aug 2011 14:07:12 +0000 (+0000)
Subject: Followup r94375; Use PROTO_RELATIVE so that when $wgServer is a protocol relative... 
X-Git-Tag: 1.31.0-rc.0~28277
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=14f758d2c15016bb656293058de679ddd79ce9d9;p=lhc%2Fweb%2Fwiklou.git

Followup r94375; Use PROTO_RELATIVE so that when $wgServer is a protocol relative url we don't potentially polute the cache if getFullURL is called by an extension that outputs to cache. getFullURL includes a #fragment so it's more likely that extensions outputting urls in situations that don't support protocol relative urls are using getLocalURL and expanding it.
---

diff --git a/includes/Title.php b/includes/Title.php
index ba86d60841..c58fff8060 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -843,7 +843,7 @@ class Title {
 		# Expand the url to make it a full url. Note that getLocalURL has the
 		# potential to output full urls for a variety of reasons, so we use
 		# wfExpandUrl instead of simply prepending $wgServer
-		$url = wfExpandUrl( $url );
+		$url = wfExpandUrl( $url, PROTO_RELATIVE );
 		
 		# Finally, add the fragment.
 		$url .= $this->getFragmentForURL();