* Include common.css from classic-style skins in main HTML with the bump URL

  FIXME: this may leave doubled rules which won't stand up to certain changes.
  Will want to adjust these more to eliminate the dupe @includes.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index bfdea08..114a75f 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -68,6 +68,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7636) Show Firefox 2 users "shift-alt" as accesskey prefix
 * (bug 6427) Block blocked IPs from using the mail password function
   to allow blocking of flooders
+* Include common.css from classic-style skins in main HTML with the bump URL
+  FIXME: this may leave doubled rules which won't stand up to certain changes.
+  Will want to adjust these more to eliminate the dupe @includes.
 
 
 == Languages updated ==

diff --git a/includes/Skin.php b/includes/Skin.php
index d07bbb2..72fa8a2 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -363,6 +363,8 @@ class Skin extends Linker {
                global $wgStylePath, $wgRequest, $wgContLang, $wgSquidMaxage, $wgStyleVersion;
                $sheet = $this->getStylesheet();
                $action = $wgRequest->getText('action');
+               // fixme: the common.css import might be doubled now...
+               $s = "@import \"$wgStylePath/common.css?$wgStyleVersion\";\n";
                $s = "@import \"$wgStylePath/$sheet?$wgStyleVersion\";\n";
                if($wgContLang->isRTL()) $s .= "@import \"$wgStylePath/common/common_rtl.css?$wgStyleVersion\";\n";