From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Sun, 14 Aug 2011 13:35:06 +0000 (+0000)
Subject: Followup to r92580 and r93820: r92580 duplicated the call to wfExpandUrl(), and r9382... 
X-Git-Tag: 1.31.0-rc.0~28278
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=b3599d8f8c32af2242a521fdc4e17adf74c547da;p=lhc%2Fweb%2Fwiklou.git

Followup to r92580 and r93820: r92580 duplicated the call to wfExpandUrl(), and r93820 caused them to get out of sync.
---

diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index dad98c32c0..4012b69552 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -135,10 +135,10 @@ class CSSMin {
 				// This will not be the case if we're running outside of MW
 				$lengthIncrease = 0;
 				if ( function_exists( 'wfExpandUrl' ) ) {
-					$expanded = wfExpandUrl( $match['file'][0] );
+					$expanded = wfExpandUrl( $match['file'][0], PROTO_RELATIVE );
 					$origLength = strlen( $match['file'][0] );
 					$lengthIncrease = strlen( $expanded ) - $origLength;
-					$source = substr_replace( $source, wfExpandUrl( $match['file'][0], PROTO_RELATIVE ),
+					$source = substr_replace( $source, $expanded,
 						$match['file'][1], $origLength
 					);
 				}