Added escapeClass static function to Sanitizer and updated last commit to use it...

diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 185679f..7d9ccc0 100644 (file)
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -736,6 +736,25 @@ class Sanitizer {
                return str_replace( array_keys( $replace ), array_values( $replace ), $id );
        }
 
+       /**
+        * Given a value, escape it so that it can be used as a CSS class and
+        * return it.
+        *
+        * TODO: For extra validity, input should be validated UTF-8.
+        *
+        * @link http://www.w3.org/TR/CSS21/syndata.html Valid characters/format
+        *
+        * @param string $class
+        * @return string
+        */
+       static function escapeClass( $class ) {
+               // Convert ugly stuff to underscores and kill underscores in ugly places
+               return rtrim(preg_replace(
+                       array('/(^[0-9\\-])|[\\x00-\\x20!"#$%&\'()*+,.\\/:;<=>?@[\\]^`{|}~]|\\xC2\\xA0/','/_+/'),
+                       '_',
+                       $class ), '_');
+       }
+
        /**
         * Regex replace callback for armoring links against further processing.
         * @param array $matches

diff --git a/includes/Skin.php b/includes/Skin.php
index ea9dd21..d07bbb2 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -478,7 +478,7 @@ END;
                        $a['onload'] .= 'setupRightClickEdit()';
                }
                $a['class'] = 'ns-'.$wgTitle->getNamespace().' '.($wgContLang->isRTL() ? "rtl" : "ltr").
-               ' page-'.Sanitizer::escapeId( $wgTitle->getPrefixedText() );
+               ' '.Sanitizer::escapeId( 'page-'.$wgTitle->getPrefixedText() );
                return $a;
        }
 

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 20d88ba..ff3c1d1 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -190,7 +190,7 @@ class SkinTemplate extends Skin {
                $tpl->set( 'title', $wgOut->getPageTitle() );
                $tpl->set( 'pagetitle', $wgOut->getHTMLTitle() );
                $tpl->set( 'displaytitle', $wgOut->mPageLinkTitle );
-               $tpl->set( 'pageclass', 'page-'.Sanitizer::escapeId( $wgTitle->getPrefixedText() ) );
+               $tpl->set( 'pageclass', Sanitizer::escapeClass( 'page-'.$wgTitle->getPrefixedText() ) );
 
                $nsname = @$wgCanonicalNamespaceNames[ $this->mTitle->getNamespace() ];
                if ( $nsname === NULL ) $nsname = $this->mTitle->getNsText();