From: Ian Baker Date: Wed, 14 Sep 2011 17:48:10 +0000 (+0000) Subject: Switched from prepending http for protocol-relative $wgUploadStashScalerBaseUrl to... X-Git-Tag: 1.31.0-rc.0~27666 X-Git-Url: http://git.cyclocoop.org//%22%22._DIR_PLUGIN_FULLCALENDAR.%22prive/themes/spip/images/event_edit.png/%22?a=commitdiff_plain;h=9d33d10e5454b8d609ca43244510b7b28320d29a;p=lhc%2Fweb%2Fwiklou.git Switched from prepending http for protocol-relative $wgUploadStashScalerBaseUrl to wfExpandUrl() Followup to r96934 --- diff --git a/includes/specials/SpecialUploadStash.php b/includes/specials/SpecialUploadStash.php index cc47af4203..d62038543e 100644 --- a/includes/specials/SpecialUploadStash.php +++ b/includes/specials/SpecialUploadStash.php @@ -214,7 +214,7 @@ class SpecialUploadStash extends UnlistedSpecialPage { // this is apparently a protocol-relative URL, which makes no sense in this context, // since this is used for communication that's internal to the application. // default to http. - $scalerBaseUrl = 'http:' . $scalerBaseUrl; + $scalerBaseUrl = wfExpandUrl( $scalerBaseUrl, PROTO_CANONICAL ); } // We need to use generateThumbName() instead of thumbName(), because