Change classes for <pre>s per Brion on Wikitech-l

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3a64870..c88f6b1 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -106,7 +106,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   same title as the current page, and enabled per default
 * Wrap site CSS and JavaScript in a <pre> tag, like user JS/CSS
 * (bug 10196) Add classes and dir="ltr" to the <pre>s on CSS and JS pages (new
-  classes: mw-user-css, mw-user-js, mw-site-css, mw-site-js)
+  classes: mw-code, mw-css, mw-js)
 * (bug 6711) Add $wgAddGroups and $wgRemoveGroups to allow finer control over
   usergroup assignment.
 

diff --git a/includes/Article.php b/includes/Article.php
index b4aa97f..5c325c5 100644 (file)
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -787,9 +787,8 @@ class Article {
                                or ($ns == NS_MEDIAWIKI and preg_match('/.(css|js)$/', $this->mTitle->getDBkey(), $matches))
                        ) {
                                $wgOut->addWikiText( wfMsg('clearyourcache'));
-                               $classbit = $ns == NS_USER ? 'user' : 'site';
                                $wgOut->addHTML(
-                                       "<pre class=\"mw-$classbit-{$matches[1]}\" dir=\"ltr\">"
+                                       "<pre class=\"mw-code mw-{$matches[1]}\" dir=\"ltr\">"
                                        .htmlspecialchars($this->mContent)."\n</pre>"
                                );
                        } else if ( $rt = Title::newFromRedirect( $text ) ) {