r96286 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96285‎ | r96286 | r96287 >
Date:16:06, 5 September 2011
Author:catrope
Status:ok
Tags:
Comment:
Fix r95653: as reported on bug 30680, this broke Collection. Expanding $wgScriptPath using $wgCanonicalServer results in a mix of secure and non-secure URL patterns. Going back to PROTO_CURRENT which doesn't have this problem
Modified paths:
  • /trunk/extensions/Collection/Collection.body.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Collection/Collection.body.php
@@ -944,7 +944,7 @@
945945
946946 $response = self::mwServeCommand( 'render', array(
947947 'metabook' => $this->buildJSONCollection( $collection ),
948 - 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CANONICAL ),
 948+ 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CURRENT ),
949949 'script_extension' => $wgScriptExtension,
950950 'template_blacklist' => wfMsgForContent( 'coll-template_blacklist_title' ),
951951 'template_exclusion_category' => wfMsgForContent( 'coll-exclusion_category_title' ),
@@ -977,7 +977,7 @@
978978
979979 $response = self::mwServeCommand( 'render', array(
980980 'collection_id' => $collectionID,
981 - 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CANONICAL ),
 981+ 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CURRENT ),
982982 'script_extension' => $wgScriptExtension,
983983 'template_blacklist' => wfMsgForContent( 'coll-template_blacklist_title' ),
984984 'template_exclusion_category' => wfMsgForContent( 'coll-exclusion_category_title' ),
@@ -1153,7 +1153,7 @@
11541154
11551155 $response = self::mwServeCommand( 'zip_post', array(
11561156 'metabook' => $this->buildJSONCollection( $collection ),
1157 - 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CANONICAL ),
 1157+ 'base_url' => wfExpandUrl( $wgScriptPath, PROTO_CURRENT ),
11581158 'script_extension' => $wgScriptExtension,
11591159 'template_blacklist' => wfMsgForContent( 'coll-template_blacklist_title' ),
11601160 'template_exclusion_category' => wfMsgForContent( 'coll-exclusion_category_title' ),

Follow-up revisions

RevisionCommit summaryAuthorDate
r963601.17wmf1: MFT r96180, r96228, r96273, r96286catrope19:11, 6 September 2011
r964851.18: MFT protocol-relative URL saga: r95014, r95016, r95017, r95627, r95651,...catrope20:14, 7 September 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r95653Protocol-relative URL fixes for Collection:...catrope09:17, 29 August 2011

Status & tagging log