Don't load nonexistent fix files for non-Monobook

Bug 14717.  I just hardcoded "&& skin == 'monobook'" in wikibits.js.  As
far as I know, no other skin actually uses fix files -- Vector, for
instance, just uses selector hacks in main-{ltr,rtl}.css as far as I
know.  Using separate files is arguably a bad idea, because it
gratuitously adds extra loads, encourages style changes to fall out of
sync, etc.  Plus, happily, the era of CSS fixes seems to be drawing to a
close -- Firefox 3.0, IE8, Opera 10, and all Safari and Chrome get by
fine with no fix files for any skin.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 669f000..93cedef 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -700,6 +700,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 2658) Don't attempt to set the TZ environment variable.
 * (bug 9794) User rights log entries for foreign user now links to the foreign
   user's page if possible
+* (bug 14717) Don't load nonexistent CSS fix files for non-Monobook skins
 
 == API changes in 1.16 ==
 

diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index dbd85e4..960112c 100644 (file)
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -101,10 +101,8 @@ function appendCSS( text ) {
        return s;
 }
 
-// special stylesheet links
-if ( typeof stylepath != 'undefined' && typeof skin != 'undefined' ) {
-       // FIXME: This tries to load the stylesheets even for skins where they
-       // don't exist, i.e., everything but Monobook.
+// Special stylesheet links for Monobook only (see bug 14717)
+if ( typeof stylepath != 'undefined' && skin == 'monobook' ) {
        if ( opera6_bugs ) {
                importStylesheetURI( stylepath + '/' + skin + '/Opera6Fixes.css' );
        } else if ( opera7_bugs ) {