From c6ed10eebfd49707363e3ed6aa84ad5356cad845 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= Date: Sat, 12 Oct 2013 20:24:41 +0200 Subject: [PATCH] Simplify watchlist edit mode handling The old "clear" mode has been killed years ago and now acts the same as the "raw" mode. Make SpecialEditWatchlist::getMode() return EDIT_RAW where it would previously return EDIT_CLEAR, simplify handling at call sites, update comments. Change-Id: I1213c83b7040ae500a0299817ee503ab1b5616c6 --- includes/specials/SpecialEditWatchlist.php | 8 ++------ includes/specials/SpecialWatchlist.php | 16 +++++----------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php index b6005de4e5..b33703d99f 100644 --- a/includes/specials/SpecialEditWatchlist.php +++ b/includes/specials/SpecialEditWatchlist.php @@ -36,7 +36,8 @@ */ class SpecialEditWatchlist extends UnlistedSpecialPage { /** - * Editing modes + * Editing modes. EDIT_CLEAR is no longer used; the "Clear" link scared people + * too much. Now it's passed on to the raw editor, from which it's very easy to clear. */ const EDIT_CLEAR = 1; const EDIT_RAW = 2; @@ -95,10 +96,6 @@ class SpecialEditWatchlist extends UnlistedSpecialPage { $mode = self::getMode( $this->getRequest(), $mode ); switch ( $mode ) { - case self::EDIT_CLEAR: - // The "Clear" link scared people too much. - // Pass on to the raw editor, from which it's very easy to clear. - case self::EDIT_RAW: $out->setPageTitle( $this->msg( 'watchlistedit-raw-title' ) ); $form = $this->getRawForm(); @@ -636,7 +633,6 @@ class SpecialEditWatchlist extends UnlistedSpecialPage { switch ( $mode ) { case 'clear': case self::EDIT_CLEAR: - return self::EDIT_CLEAR; case 'raw': case self::EDIT_RAW: return self::EDIT_RAW; diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php index 59f0dfedc0..6572a0839c 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -74,18 +74,12 @@ class SpecialWatchlist extends SpecialPage { $mode = SpecialEditWatchlist::getMode( $request, $par ); if ( $mode !== false ) { - # TODO: localise? - switch ( $mode ) { - case SpecialEditWatchlist::EDIT_CLEAR: - $mode = 'clear'; - break; - case SpecialEditWatchlist::EDIT_RAW: - $mode = 'raw'; - break; - default: - $mode = null; + if ( $mode === SpecialEditWatchlist::EDIT_RAW ) { + $title = SpecialPage::getTitleFor( 'EditWatchlist', 'raw' ); + } else { + $title = SpecialPage::getTitleFor( 'EditWatchlist' ); } - $title = SpecialPage::getTitleFor( 'EditWatchlist', $mode ); + $output->redirect( $title->getLocalURL() ); return; } -- 2.20.1