From 1b8fc538442a7c900b194e4597732cce28874a02 Mon Sep 17 00:00:00 2001 From: Aryeh Gregor Date: Wed, 29 Sep 2010 20:05:16 +0000 Subject: [PATCH] Fix IEFixes.js loading again Bug 25167. The fix in r65774 was wrong -- apparently I didn't test well enough. I've tested the new fix by loading IE6 and requesting a page from my wiki without it, verifying with Wireshark that no HTTP request was sent for IEFixes.js, and then repeating with the fix applied to verify it works. Will backport to 1.16, like r65774, since this is still a regression from 1.15. Note that only IE6 and less were ever affected, and things seem to be mostly usable without the fixes file, so I don't think this is of enormous importance. --- RELEASE-NOTES | 1 + skins/common/wikibits.js | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 95204d3c95..e3ebd1ec39 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -340,6 +340,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN * SQLite system table names are now never prefixed. * (bug 25292) SkinSubPageSubtitle hook now passes the Skin object as second parameter +* (bug 25167) Correctly load JS fixes for IE6 (fixing a regression in 1.16) === API changes in 1.17 === * (bug 22738) Allow filtering by action type on query=logevent. diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js index 6c7d450ef5..ab8e50c2bc 100644 --- a/skins/common/wikibits.js +++ b/skins/common/wikibits.js @@ -41,7 +41,7 @@ if (clientPC.indexOf('opera') != -1) { // avoiding false positives from moronic extensions that append to the IE UA // string (bug 23171) window.ie6_bugs = false; -if ( /MSIE ([0-9]{1,}[\.0-9]{0,})/.exec( clientPC ) != null +if ( /msie ([0-9]{1,}[\.0-9]{0,})/.exec( clientPC ) != null && parseFloat( RegExp.$1 ) <= 6.0 ) { ie6_bugs = true; } @@ -1101,4 +1101,4 @@ if ( ie6_bugs ) { // jQuery alias -window.$j = jQuery; \ No newline at end of file +window.$j = jQuery; -- 2.20.1