(bug 32412) TOC links on [[Special:EditWatchlist]] points to the fieldsets

Points the TOC entry to the fieldset element and add an id to those fieldset
using the same id prefix we used in 1.17 ('editwatchlist-')

This is a 1.18 regression.

diff --git a/RELEASE-NOTES-1.18 b/RELEASE-NOTES-1.18
index 034b77f..9b1bb11 100644 (file)
--- a/RELEASE-NOTES-1.18
+++ b/RELEASE-NOTES-1.18
@@ -35,6 +35,7 @@ production.
 * (bug 29854) Store protocol-relative links twice in the externallinks table,
   one with http: in el_index and once with https.
 * (bug 31822) Error during upgrade due to output buffer reset in stdout.
+* (bug 32412) TOC links on [[Special:EditWatchlist]] points to the fieldsets
 
 === Configuration changes in 1.18 ===
 * The WantedPages::getSQL hook has been removed and replaced with

diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index 80c6ee8..cde2ca3 100644 (file)
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -416,7 +416,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
                                $nsText = ($ns == NS_MAIN)
                                        ? wfMsgHtml( 'blanknamespace' )
                                        : htmlspecialchars( $wgContLang->getFormattedNsText( $ns ) );
-                               $this->toc .= Linker::tocLine( "mw-htmlform-{$data['section']}", $nsText,
+                               $this->toc .= Linker::tocLine( "editwatchlist-{$data['section']}", $nsText,
                                        $this->getLanguage()->formatNum( ++$tocLength ), 1 ) . Linker::tocLineEnd();
                        }
                        $this->toc = Linker::tocList( $this->toc );
@@ -559,6 +559,9 @@ class EditWatchlistNormalHTMLForm extends HTMLForm {
                        ? wfMsgHtml( 'blanknamespace' )
                        : htmlspecialchars( $this->getContext()->getLanguage()->getFormattedNsText( $namespace ) );
        }
+       public function getBody() {
+               return $this->displaySection( $this->mFieldTree, '', 'editwatchlist-' );
+       }
 }
 
 class EditWatchlistCheckboxSeriesField extends HTMLMultiSelectField {