Merge "SpecialWatchlist: Remove random unnecessary `<hr>`"

diff --combined includes/specials/SpecialWatchlist.php
index 34c44d4,a01df69..b5382a6
--- 1/includes/specials/SpecialWatchlist.php
--- 2/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@@ -403,15 -403,8 +403,15 @@@ class SpecialWatchlist extends ChangesL
         */
        public function doHeader( $opts, $numRows ) {
                $user = $this->getUser();
 +              $out = $this->getOutput();
  
 -              $this->getOutput()->addSubtitle(
 +              // if the user wishes, that the watchlist is reloaded, whenever a filter changes,
 +              // add the module for that
 +              if ( $user->getBoolOption( 'watchlistreloadautomatically' ) ) {
 +                      $out->addModules( array( 'mediawiki.special.watchlist' ) );
 +              }
 +
 +              $out->addSubtitle(
                        $this->msg( 'watchlistfor2', $user->getName() )
                                ->rawParams( SpecialEditWatchlist::buildTools( null ) )
                );
@@@ -476,7 -469,7 +476,7 @@@
                $form .= $this->msg( 'watchlist-hide' ) .
                        $this->msg( 'colon-separator' )->escaped() .
                        implode( ' ', $links );
-               $form .= "\n<hr />\n<p>";
+               $form .= "\n<br />\n";
                $form .= Html::namespaceSelector(
                        array(
                                'selected' => $opts['namespace'],
@@@ -502,7 -495,7 +502,7 @@@
                        $opts['associated'],
                        array( 'title' => $this->msg( 'tooltip-namespace_association' )->text() )
                ) . "</span>\n";
-               $form .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . "</p>\n";
+               $form .= Xml::submitButton( $this->msg( 'allpagessubmit' )->text() ) . "\n";
                foreach ( $hiddenFields as $key => $value ) {
                        $form .= Html::hidden( $key, $value ) . "\n";
                }