Merge "Fix tocList() breakage in 6fe1f050"

diff --git a/includes/Linker.php b/includes/Linker.php
index 632cf43..32a99cb 100644 (file)
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1594,7 +1594,11 @@ class Linker {
         * @return String: full html of the TOC
         */
        public static function tocList( $toc, $lang = false ) {
-               $title = wfMessage( 'toc' )->inLanguage( $lang )->escaped();
+               $msg = wfMessage( 'toc' );
+               if ( $lang !== false ) {
+                       $msg = $msg->inLanguage( $lang );
+               }
+               $title = $msg->escaped();
                return
                   '<table id="toc" class="toc"><tr><td>'
                 . '<div id="toctitle"><h2>' . $title . "</h2></div>\n"