r97078 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r97077‎ | r97078 | r97079 >
Date:17:48, 14 September 2011
Author:raindrift
Status:ok
Tags:
Comment:
Switched from prepending http for protocol-relative $wgUploadStashScalerBaseUrl to wfExpandUrl()
Followup to r96934
Modified paths:
  • /trunk/phase3/includes/specials/SpecialUploadStash.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/specials/SpecialUploadStash.php
@@ -214,7 +214,7 @@
215215 // this is apparently a protocol-relative URL, which makes no sense in this context,
216216 // since this is used for communication that's internal to the application.
217217 // default to http.
218 - $scalerBaseUrl = 'http:' . $scalerBaseUrl;
 218+ $scalerBaseUrl = wfExpandUrl( $scalerBaseUrl, PROTO_CANONICAL );
219219 }
220220
221221 // We need to use generateThumbName() instead of thumbName(), because

Follow-up revisions

RevisionCommit summaryAuthorDate
r97082Merged revisions 97057,97060,97071,97073-97074,97077-97080 via svnmerge from...dantman18:11, 14 September 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r96934If the scaler URL is protocol-relative, things just break here. Sets a sane ...raindrift00:53, 13 September 2011

Status & tagging log