r94456 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r94455‎ | r94456 | r94457 >
Date:13:35, 14 August 2011
Author:catrope
Status:ok
Tags:
Comment:
Followup to r92580 and r93820: r92580 duplicated the call to wfExpandUrl(), and r93820 caused them to get out of sync.
Modified paths:
  • /trunk/phase3/includes/libs/CSSMin.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/libs/CSSMin.php
@@ -135,10 +135,10 @@
136136 // This will not be the case if we're running outside of MW
137137 $lengthIncrease = 0;
138138 if ( function_exists( 'wfExpandUrl' ) ) {
139 - $expanded = wfExpandUrl( $match['file'][0] );
 139+ $expanded = wfExpandUrl( $match['file'][0], PROTO_RELATIVE );
140140 $origLength = strlen( $match['file'][0] );
141141 $lengthIncrease = strlen( $expanded ) - $origLength;
142 - $source = substr_replace( $source, wfExpandUrl( $match['file'][0], PROTO_RELATIVE ),
 142+ $source = substr_replace( $source, $expanded,
143143 $match['file'][1], $origLength
144144 );
145145 }

Follow-up revisions

RevisionCommit summaryAuthorDate
r94472MFT to REL1_18:...hashar19:43, 14 August 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r92580Fixes for URL expanding in CSSMin: adjust the offset correctly (this could've...catrope21:19, 19 July 2011
r93820Some random URL protocol forcing for protocol-relative URLscatrope12:58, 3 August 2011

Status & tagging log