From d557bd779e60f4b3b70be4704a52aa400032f588 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 28 Jun 2005 15:52:18 +0000
Subject: [PATCH] * Don't show bogus messages about watchlist notifications
 when disabled * Don't show old debug messages in watchlist

---
 RELEASE-NOTES                 | 2 ++
 includes/SpecialWatchlist.php | 7 ++++---
 languages/Language.php        | 3 +--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 021caac375..a355280f96 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -398,6 +398,8 @@ Various bugfixes, small features, and a few experimental things:
 * (bug 2568) Fixed a logic error in the Special:Statistics code which caused
   the displayed percentage of admins to be totally off.
 * (bug 2560) Don't show blank width/height attributes for missing size
+* Don't show bogus messages about watchlist notifications when disabled
+* Don't show old debug messages in watchlist
 
 
 === Caveats ===
diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index 3793d1c342..7f1fbb5cba 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -18,6 +18,7 @@ function wfSpecialWatchlist( $par ) {
 	global $wgUser, $wgOut, $wgLang, $wgTitle, $wgMemc, $wgRequest, $wgContLang;;
 	global $wgUseWatchlistCache, $wgWLCacheTimeout, $wgDBname;
 	global $wgRCShowWatchingUsers, $wgEnotifWatchlist, $wgShowUpdatedMarker;
+	global $wgEnotifWatchlist;
 	$fname = 'wfSpecialWatchlist';
 
 	$wgOut->setPagetitle( wfMsg( 'watchlist' ) );
@@ -40,7 +41,7 @@ function wfSpecialWatchlist( $par ) {
 	$id = $wgRequest->getArray( 'id' );
 
 	$uid = $wgUser->getID();
-	if( $wgRequest->getVal( 'reset' ) && $wgRequest->wasPosted() ) {
+	if( $wgEnotifWatchlist && $wgRequest->getVal( 'reset' ) && $wgRequest->wasPosted() ) {
 		$wgUser->clearAllNotifications( $uid );
 	}
 
@@ -203,7 +204,7 @@ function wfSpecialWatchlist( $par ) {
 	if( $wgUser->getOption( 'enotifwatchlistpages' ) && $wgEnotifWatchlist) {
 		$header .= wfMsg( 'wlheader-enotif' ) . "\n";
 	}
-	if ( $wgShowUpdatedMarker ) {
+	if ( $wgEnotifWatchlist && $wgShowUpdatedMarker ) {
 		$header .= wfMsg( 'wlheader-showupdated' ) . "\n";
 	}
 
@@ -212,7 +213,7 @@ function wfSpecialWatchlist( $par ) {
 		$specialTitle->getFullUrl( 'edit=yes' ) );
 	$wgOut->addWikiText( $header );
 	
-	if ( $wgShowUpdatedMarker ) {
+	if ( $wgEnotifWatchlist && $wgShowUpdatedMarker ) {
 		$wgOut->addHTML( '<form action="' .
 			$specialTitle->escapeLocalUrl() .
 			'" method="post"><input type="submit" name="dummy" value="' .
diff --git a/languages/Language.php b/languages/Language.php
index 683f974aad..b888ae915b 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -1231,8 +1231,7 @@ make it easier to pick out.
 'unwatchthispage' 	=> 'Stop watching',
 'notanarticle'		=> 'Not a content page',
 'watchnochange' 	=> 'None of your watched items were edited in the time period displayed.',
-'watchdetails'		=> "* $1 pages watched not counting talk pages, $2 total pages edited in the specified period
-* Query method: $3
+'watchdetails'		=> "* $1 pages watched not counting talk pages
 * [[Special:Watchlist/edit|Show and edit complete watchlist]]
 ",
 'wlheader-enotif' 		=> "* Email notification is enabled.",
-- 
2.20.1