Merge "Remove a bunch of trailing spaces and unneeded newlines"

[lhc/web/wiklou.git] / includes / specials / SpecialEditWatchlist.php

diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index 091f5ca..23cd9aa 100644 (file)
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -103,7 +103,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
                                $form = $this->getRawForm();
                                if( $form->show() ){
                                        $out->addHTML( $this->successMessage );
-                                       $out->returnToMain();
+                                       $out->addReturnTo( SpecialPage::getTitleFor( 'Watchlist' ) );
                                }
                                break;
 
@@ -113,7 +113,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
                                $form = $this->getNormalForm();
                                if( $form->show() ){
                                        $out->addHTML( $this->successMessage );
-                                       $out->returnToMain();
+                                       $out->addReturnTo( SpecialPage::getTitleFor( 'Watchlist' ) );
                                } elseif ( $this->toc !== false ) {
                                        $out->prependHTML( $this->toc );
                                }
@@ -499,7 +499,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
                if ( count( $fields ) > 1 && $count > 30 ) {
                        $this->toc = Linker::tocIndent();
                        $tocLength = 0;
-                       foreach( $fields as $key => $data ) {
+                       foreach( $fields as $data ) {
 
                                # strip out the 'ns' prefix from the section name:
                                $ns = substr( $data['section'], 2 );
@@ -632,12 +632,12 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
                        // can use messages 'watchlisttools-view', 'watchlisttools-edit', 'watchlisttools-raw'
                        $tools[] = Linker::linkKnown(
                                SpecialPage::getTitleFor( $arr[0], $arr[1] ),
-                               wfMsgHtml( "watchlisttools-{$mode}" )
+                               wfMessage( "watchlisttools-{$mode}" )->escaped()
                        );
                }
                return Html::rawElement( 'span',
                                        array( 'class' => 'mw-watchlist-toollinks' ),
-                                       wfMsg( 'parentheses', $wgLang->pipeList( $tools ) ) );
+                                       wfMessage( 'parentheses', $wgLang->pipeList( $tools ) )->text() );
        }
 }