From ed1909d8d16dc9920d8aa6322a960b46ed35600b Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 18 Dec 2004 03:59:06 +0000
Subject: [PATCH] Clean up default options, and remove so-called "UseMod-style"
 RC option which fails to provide the information that UseMod's RC does, as
 has been noted before.

---
 includes/DefaultSettings.php      | 12 +++++-------
 includes/SpecialPreferences.php   |  5 ++---
 includes/SpecialRecentchanges.php |  8 +++-----
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2e0b48502c..4bada21967 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -544,18 +544,16 @@ $wgEmailNotificationMailsSentFromPageEditor	= false; # false: Enotif mails appea
 # If set to false, the corresponding input form on the user preference page is suppressed
 # It call this to be a "user-preferences-option (UPO)"
 $wgEmailAuthentication				= true; # UPO (if this is set to false, texts referring to authentication are suppressed)
-$wgEmailNotificationForWatchlistPages		= true; # UPO
-$wgEmailNotificationForUserTalkPages		= true;	# UPO
-$wgEmailNotificationRevealPageEditorAddress	= true;	# UPO; reply-to address may be filled with page editor's address (if user allowed this in the preferences)
+$wgEmailNotificationForWatchlistPages		= false; # UPO
+$wgEmailNotificationForUserTalkPages		= false;	# UPO
+$wgEmailNotificationRevealPageEditorAddress	= false;	# UPO; reply-to address may be filled with page editor's address (if user allowed this in the preferences)
 $wgEmailNotificationForMinorEdits		= true;	# UPO; false: "minor edits" on pages do not trigger notification mails.
 #							# Attention: _every_ change on a user_talk page trigger a notification mail (if the user is not yet notified)
 
-# Show recent changes in UseMod style, i.e. only the recent change of a page is listed
-$wgRCUseModStyle 				= true; # UPO
 # Show watching users in recent changes, watchlist and page history views
-$wgRCShowWatchingUsers 				= true; # UPO
+$wgRCShowWatchingUsers 				= false; # UPO
 # Show watching users in Page views
-$wgPageShowWatchingUsers 			= true;
+$wgPageShowWatchingUsers 			= false;
 # Show "Updated (since my last visit)" marker in RC view, watchlist and history view for watched pages with new changes
 $wgShowUpdatedMarker 				= true; # UPO
 
diff --git a/includes/SpecialPreferences.php b/includes/SpecialPreferences.php
index bffacf4a88..84d383ad21 100644
--- a/includes/SpecialPreferences.php
+++ b/includes/SpecialPreferences.php
@@ -358,7 +358,7 @@ class PreferencesForm {
 		global $wgAllowRealName, $wgImageLimits;
 		global $wgLanguageNames, $wgDisableLangConversion;
 		global $wgEmailNotificationForWatchlistPages, $wgEmailNotificationForUserTalkPages,$wgEmailNotificationForMinorEdits;
-		global $wgRCUseModStyle, $wgRCShowWatchingUsers, $wgEmailNotificationRevealPageEditorAddress;
+		global $wgRCShowWatchingUsers, $wgEmailNotificationRevealPageEditorAddress;
 		global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication;
 		global $wgContLanguageCode;
 
@@ -622,13 +622,12 @@ class PreferencesForm {
 	</fieldset>\n\n" );
 
 		$shownumberswatching = ($wgRCShowWatchingUsers) ? $this->getToggle('shownumberswatching') : '';
-		$rcusemodstyle = ($wgRCUseModStyle) ? $this->getToggle('rcusemodstyle') : '';
 
 		$wgOut->addHTML( "
 	<fieldset><legend>".wfMsg('prefs-rc')."</legend>
 		<div><label>$rcc: <input type='text' name=\"wpRecent\" value=\"$this->mRecent\" size='6' /></label></div>" .
 		$this->getToggle( "hideminor" ) . $shownumberswatching .
-		$this->getToggle( "usenewrc" ) . $rcusemodstyle . $this->getToggle('showupdated', wfMsg('updatedmarker')) .
+		$this->getToggle( "usenewrc" ) . $this->getToggle('showupdated', wfMsg('updatedmarker')) .
 		"<div><label>$stt: <input type='text' name=\"wpStubs\" value=\"$this->mStubs\" size='6' /></label></div>
                 <div><label>".wfMsg('imagemaxsize')."<select name=\"wpImageSize\">");
 		
diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index 2e24661dde..f5e6cf9aa4 100644
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -18,7 +18,7 @@ function wfSpecialRecentchanges( $par ) {
 	global $wgUser, $wgOut, $wgLang, $wgContLang, $wgTitle, $wgMemc, $wgDBname;
 	global $wgRequest, $wgSitename, $wgLanguageCode, $wgContLanguageCode;
 	global $wgFeedClasses, $wgUseRCPatrol;
-	global $wgRCUseModStyle, $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
+	global $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
 	$fname = 'wfSpecialRecentchanges';
 
 	# Get query parameters
@@ -116,13 +116,11 @@ function wfSpecialRecentchanges( $par ) {
 	$patrLink = $sk->makeKnownLink( $wgContLang->specialPage( 'Recentchanges' ),
 	  $showhide[1-$hidepatrolled], wfArrayToCGI( array( 'hidepatrolled' => 1-$hidepatrolled ), $urlparams ) );
 
-	$RCUseModStyle = ($wgRCUseModStyle && $wgUser->getOption('rcusemodstyle')) ? 'AND rc_this_oldid=0 '  :  '' ;
-
 	$uid = $wgUser->getID();
 	# Patch for showing "updated since last visit" marker
 	$sql2 = "SELECT $recentchanges.*" . ($uid ? ",wl_user,wl_notificationtimestamp" : "") . " FROM $recentchanges " .
 	  ($uid ? "LEFT OUTER JOIN $watchlist ON wl_user={$uid} AND wl_title=rc_title AND wl_namespace=rc_namespace " : "") .
-	  "WHERE rc_timestamp > '{$cutoff}' {$hidem} " . $RCUseModStyle .
+	  "WHERE rc_timestamp > '{$cutoff}' {$hidem} " .
 	  "ORDER BY rc_timestamp DESC LIMIT {$limit}";
 
 	$res = $dbr->query( $sql2, DB_SLAVE, $fname );
@@ -168,7 +166,7 @@ function wfSpecialRecentchanges( $par ) {
 
 				if ($wgShowUpdatedMarker
 					&& $wgUser->getOption( 'showupdated' )
-					&& $obj->wl_notificationtimestamp
+					&& !empty( $obj->wl_notificationtimestamp )
 					&& ($obj->rc_timestamp >= $obj->wl_notificationtimestamp)) {
 						$rc->notificationtimestamp = true;
 				} else {
-- 
2.20.1