dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: eee5e17)
Revert r38675:
authorDaniel Friesen <dantman@users.mediawiki.org>
Wed, 6 Aug 2008 02:18:14 +0000 (02:18 +0000)
committerDaniel Friesen <dantman@users.mediawiki.org>
Wed, 6 Aug 2008 02:18:14 +0000 (02:18 +0000)
This commit was clearly not thought out and poorly implemented.
* The Sanitizer has not been used
* Proper implementation of this would follow the same convention as the other classNames and have a 'skin-' prefix
Consistency in the code organization wasn't even kept, a bit of code was just lazily tacked onto the end of another line.

RELEASE-NOTES patch | blob | history
includes/Skin.php patch | blob | history
skins/Modern.php patch | blob | history
skins/MonoBook.php patch | blob | history

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 33e3c33..f76cdef 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -57,7 +57,6 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 2333) Redirects are properly rendered when previewing an edit.
 * (bug 14972) Use localized alias of Special:Search on all search forms
 * (bug 11035) Special:Search should have descriptive <title>
-* (bug 15052) Skins should add their name as a class in <body>
 
 === API changes in 1.14 ===
 
diff --git a/includes/Skin.php b/includes/Skin.php
index 4e3bb81..71ada4c 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -551,7 +551,7 @@ END;
                $a['class'] =
                        'mediawiki ns-'.$wgTitle->getNamespace().
                        ' '.($wgContLang->isRTL() ? "rtl" : "ltr").
-                       ' '.Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() ) .' '. get_class( $this );
+                       ' '.Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() );
                return $a;
        }
 
diff --git a/skins/Modern.php b/skins/Modern.php
index 6961a22..b406743 100644 (file)
--- a/skins/Modern.php
+++ b/skins/Modern.php
@@ -95,7 +95,7 @@ class ModernTemplate extends QuickTemplate {
        </head>
 <body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
 <?php if($this->data['body_onload'    ]) { ?> onload="<?php     $this->text('body_onload')     ?>"<?php } ?>
- class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinclass') ?>">
+ class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?>">
 
        <!-- heading -->
        <div id="mw_header"><h1 id="firstHeading"><?php $this->data['displaytitle']!=""?$this->html('title'):$this->text('title') ?></h1></div>
diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 86248ee..a96a147 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -104,7 +104,7 @@ class MonoBookTemplate extends QuickTemplate {
        </head>
 <body<?php if($this->data['body_ondblclick']) { ?> ondblclick="<?php $this->text('body_ondblclick') ?>"<?php } ?>
 <?php if($this->data['body_onload']) { ?> onload="<?php $this->text('body_onload') ?>"<?php } ?>
- class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?> <?php $this->text('skinclass') ?>">
+ class="mediawiki <?php $this->text('nsclass') ?> <?php $this->text('dir') ?> <?php $this->text('pageclass') ?>">
        <div id="globalWrapper">
                <div id="column-content">
        <div id="content">
Wiklou, le Wiki du Wiklou