Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/234509
Change subject: resourceloader: Don't add "&*" query parameter to load.php urls
......................................................................
resourceloader: Don't add "&*" query parameter to load.php urls
Follows-up r88883 (8dab43f703). The IEUrlExtension library only considers the
query string if the base path has no extension (or if the dot is urlencoded).
Neither of which is the case for load.php urls.
Ref T30840.
Change-Id: I4a4ef7ef5ad7d74ecb47a44342e6324fa9844173
---
M includes/resourceloader/ResourceLoader.php
M resources/src/mediawiki/mediawiki.js
2 files changed, 3 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/09/234509/1
diff --git a/includes/resourceloader/ResourceLoader.php
b/includes/resourceloader/ResourceLoader.php
index cecb6a2..fd2263b 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1486,9 +1486,7 @@
$query = self::createLoaderQuery( $context, $extraQuery );
$script = $this->getLoadScript( $source );
- // Prevent the IE6 extension check from being triggered (bug
28840)
- // by appending a character that's invalid in Windows
extensions ('*')
- return wfExpandUrl( wfAppendQuery( $script, $query ) . '&*',
PROTO_RELATIVE );
+ return wfExpandUrl( wfAppendQuery( $script, $query ),
PROTO_RELATIVE );
}
/**
@@ -1516,9 +1514,7 @@
$only, $printable, $handheld, $extraQuery
);
- // Prevent the IE6 extension check from being triggered (bug
28840)
- // by appending a character that's invalid in Windows
extensions ('*')
- return wfExpandUrl( wfAppendQuery( $wgLoadScript, $query ) .
'&*', PROTO_RELATIVE );
+ return wfExpandUrl( wfAppendQuery( $wgLoadScript, $query ),
PROTO_RELATIVE );
}
/**
diff --git a/resources/src/mediawiki/mediawiki.js
b/resources/src/mediawiki/mediawiki.js
index 6548896..21c6f27 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -1428,10 +1428,7 @@
currReqBase
);
request = sortQuery( request );
- // Support: IE6
- // Append &* to satisfy load.php's
WebRequest::checkUrlExtension test.
- // This script isn't actually used in IE6, but
MediaWiki enforces it in general.
- addScript( sourceLoadScript + '?' + $.param(
request ) + '&*' );
+ addScript( sourceLoadScript + '?' + $.param(
request ) );
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/234509
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4a4ef7ef5ad7d74ecb47a44342e6324fa9844173
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
