r95855 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r95854‎ | r95855 | r95856 >
Date:12:09, 31 August 2011
Author:catrope
Status:ok
Tags:
Comment:
Followup r95663: per CR, use the current protocol for expanding the thumbnail URL too. I thought I had a good reason for using the canonical protocol, but as Brion points out mixing protocols here doesn't make much sense
Modified paths:
  • /trunk/extensions/OpenSearchXml/ApiOpenSearchXml.php (modified) (history)

Diff [purge]

Index: trunk/extensions/OpenSearchXml/ApiOpenSearchXml.php
@@ -126,7 +126,7 @@
127127 if( $image ) {
128128 $thumb = $image->transform( array( 'width' => 50, 'height' => 50 ), 0 );
129129 $item['Image'] = array(
130 - 'source' => wfExpandUrl( $thumb->getUrl(), PROTO_CANONICAL ),
 130+ 'source' => wfExpandUrl( $thumb->getUrl(), PROTO_CURRENT ),
131131 //alt
132132 'width' => $thumb->getWidth(),
133133 'height' => $thumb->getHeight() );

Follow-up revisions

RevisionCommit summaryAuthorDate
r959011.17wmf1: MFT HTTPS / prot rel URL fixes: r95627, r95651, r95652, r95653, r95...catrope19:15, 31 August 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
r95663Last commit to make WMF-deployed extensions HTTPS-ready (hopefully): use wfEx...catrope14:37, 29 August 2011

Status & tagging log