KTHMLfixes no longer loaded on skins where it doesn't exist. (bug 14717)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c5d7544..898c65e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -413,6 +413,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14088) Excessively long block expiry times are rejected as invalid,
   keeps the log page from being distorted.
 * (bug 14708) Emulate INSERT...IGNORE with standard SQL for Postgres backend.
+* (bug 14717) Wikibits no longer tries to load KTHMLFixes on non-monobook skins
 
 === API changes in 1.13 ===
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 07423a4..504393f 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1353,7 +1353,7 @@ $wgCacheEpoch = '20030516000000';
  * to ensure that client-side caches don't keep obsolete copies of global
  * styles.
  */
-$wgStyleVersion = '160';
+$wgStyleVersion = '161';
 
 
 # Server-side caching:

diff --git a/skins/common/wikibits.js b/skins/common/wikibits.js
index 373c8ee..e8e30fe 100644 (file)
--- a/skins/common/wikibits.js
+++ b/skins/common/wikibits.js
@@ -92,7 +92,7 @@ if (typeof stylepath != 'undefined' && typeof skin != 'undefined') {
                document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'/'+skin+'/Opera6Fixes.css">');
        } else if (is_opera_seven && !is_opera_95) {
                document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'/'+skin+'/Opera7Fixes.css">');
-       } else if (is_khtml) {
+       } else if (is_khtml && skin == 'monobook' ) {
                document.write('<link rel="stylesheet" type="text/css" href="'+stylepath+'/'+skin+'/KHTMLFixes.css">');
        }
 }