For HTML 5, drop type="" attributes for CSS/JS

[lhc/web/wiklou.git] / includes / Linker.php

diff --git a/includes/Linker.php b/includes/Linker.php
index 3cdb545..8497a83 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1053,6 +1053,7 @@ class Linker {
                        $text = $match[1];
                }
                $submatch = array();
+               $thelink = null;
                if( preg_match( '/^' . $medians . '(.*)$/i', $match[1], $submatch ) ) {
                        # Media link; trail not supported.
                        $linkRegexp = '/^(.*?)\]\]/';
@@ -1087,7 +1088,10 @@ class Linker {
                                ) . $trail;
                        }
                }
-               $comment = preg_replace( $linkRegexp, StringUtils::escapeRegexReplacement( $thelink ), $comment, 1 );
+               if( $thelink ) {
+                       // If the link is still valid, go ahead and replace it in!
+                       $comment = preg_replace( $linkRegexp, StringUtils::escapeRegexReplacement( $thelink ), $comment, 1 );
+               }
 
                return $comment;
        }
@@ -1253,22 +1257,21 @@ class Linker {
 
        /** @todo document */
        function tocList($toc) {
-               global $wgJsMimeType;
                $title = wfMsgHtml('toc') ;
                return
-                  '<table id="toc" class="toc" summary="' . $title .'"><tr><td>'
+                  '<table id="toc" class="toc"><tr><td>'
                 . '<div id="toctitle"><h2>' . $title . "</h2></div>\n"
                 . $toc
                 # no trailing newline, script should not be wrapped in a
                 # paragraph
                 . "</ul>\n</td></tr></table>"
-                . '<script type="' . $wgJsMimeType . '">'
-                . ' if (window.showTocToggle) {'
-                . ' var tocShowText = "' . Xml::escapeJsString( wfMsg('showtoc') ) . '";'
-                . ' var tocHideText = "' . Xml::escapeJsString( wfMsg('hidetoc') ) . '";'
-                . ' showTocToggle();'
-                . ' } '
-                . "</script>\n";
+                . Html::inlineScript(
+                       'if (window.showTocToggle) {'
+                       . ' var tocShowText = "' . Xml::escapeJsString( wfMsg('showtoc') ) . '";'
+                       . ' var tocHideText = "' . Xml::escapeJsString( wfMsg('hidetoc') ) . '";'
+                       . ' showTocToggle();'
+                       . ' } ' )
+               . "\n";
        }
        
        /**
@@ -1362,9 +1365,9 @@ class Linker {
         * @return string HTML headline
         */
        public function makeHeadline( $level, $attribs, $anchor, $text, $link, $legacyAnchor = false ) {
-               $ret = "<h$level id=\"$anchor\"$attribs"
+               $ret = "<h$level$attribs"
                        . $link
-                       . " <span class=\"mw-headline\">$text</span>"
+                       . " <span class=\"mw-headline\" id=\"$anchor\">$text</span>"
                        . "</h$level>";
                if ( $legacyAnchor !== false ) {
                        $ret = "<a id=\"$legacyAnchor\"></a>$ret";