Merge "resourceloader: Use "\n" instead of ";" as separator for scripts"

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

diff --git a/includes/Linker.php b/includes/Linker.php
index bed9957..6942a39 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1561,7 +1561,7 @@ class Linker {
                $title = wfMessage( 'toc' )->inLanguage( $lang )->escaped();
 
                return '<div id="toc" class="toc">'
-                       . '<div id="toctitle" class="toctitle"><h2>' . $title . "</h2></div>\n"
+                       . '<div class="toctitle"><h2>' . $title . "</h2></div>\n"
                        . $toc
                        . "</ul>\n</div>\n";
        }
@@ -2094,9 +2094,6 @@ class Linker {
         * @return array
         */
        public static function tooltipAndAccesskeyAttribs( $name, array $msgParams = [] ) {
-               # @todo FIXME: If Sanitizer::expandAttributes() treated "false" as "output
-               # no attribute" instead of "output '' as value for attribute", this
-               # would be three lines.
                $attribs = [
                        'title' => self::titleAttrib( $name, 'withaccess', $msgParams ),
                        'accesskey' => self::accesskey( $name )
@@ -2118,9 +2115,6 @@ class Linker {
         * @return null|string
         */
        public static function tooltip( $name, $options = null ) {
-               # @todo FIXME: If Sanitizer::expandAttributes() treated "false" as "output
-               # no attribute" instead of "output '' as value for attribute", this
-               # would be two lines.
                $tooltip = self::titleAttrib( $name, $options );
                if ( $tooltip === false ) {
                        return '';