? cvs-update-logfile
? cvs.diff
Index: includes/DefaultSettings.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/DefaultSettings.php,v
retrieving revision 1.232
diff -u -b -r1.232 DefaultSettings.php
--- includes/DefaultSettings.php	28 Dec 2004 22:02:19 -0000	1.232
+++ includes/DefaultSettings.php	4 Jan 2005 20:28:22 -0000
@@ -552,6 +552,8 @@
 $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 				= false; # UPO
 # Show watching users in Page views
Index: includes/SpecialPreferences.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/SpecialPreferences.php,v
retrieving revision 1.83
diff -u -b -r1.83 SpecialPreferences.php
--- includes/SpecialPreferences.php	23 Dec 2004 08:40:50 -0000	1.83
+++ includes/SpecialPreferences.php	4 Jan 2005 20:28:22 -0000
@@ -358,7 +358,7 @@
 		global $wgAllowRealName, $wgImageLimits;
 		global $wgLanguageNames, $wgDisableLangConversion;
 		global $wgEmailNotificationForWatchlistPages, $wgEmailNotificationForUserTalkPages,$wgEmailNotificationForMinorEdits;
-		global $wgRCShowWatchingUsers, $wgEmailNotificationRevealPageEditorAddress;
+		global $wgRCUseModStyle, $wgRCShowWatchingUsers, $wgEmailNotificationRevealPageEditorAddress;
 		global $wgEnableEmail, $wgEnableUserEmail, $wgEmailAuthentication;
 		global $wgContLanguageCode;
 
@@ -634,12 +634,13 @@
 	</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" ) . $this->getToggle('showupdated', wfMsg('updatedmarker')) .
+		$this->getToggle( "usenewrc" ) . $rcusemodstyle . $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\">");
 		
Index: includes/SpecialRecentchanges.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/includes/SpecialRecentchanges.php,v
retrieving revision 1.55
diff -u -b -r1.55 SpecialRecentchanges.php
--- includes/SpecialRecentchanges.php	24 Dec 2004 02:47:36 -0000	1.55
+++ includes/SpecialRecentchanges.php	4 Jan 2005 20:28:23 -0000
@@ -19,7 +19,7 @@
 	global $wgUser, $wgOut, $wgLang, $wgContLang, $wgTitle, $wgMemc, $wgDBname;
 	global $wgRequest, $wgSitename, $wgLanguageCode, $wgContLanguageCode;
 	global $wgFeedClasses, $wgUseRCPatrol;
-	global $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
+	global $wgRCUseModStyle, $wgRCShowWatchingUsers, $wgShowUpdatedMarker;
 	$fname = 'wfSpecialRecentchanges';
 
 	# Get query parameters
@@ -117,11 +117,13 @@
 	$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} " .
+	  "WHERE rc_timestamp > '{$cutoff}' {$hidem} " . $RCUseModStyle .
 	  "ORDER BY rc_timestamp DESC LIMIT {$limit}";
 
 	$res = $dbr->query( $sql2, DB_SLAVE, $fname );
Index: languages/Language.php
===================================================================
RCS file: /cvsroot/wikipedia/phase3/languages/Language.php,v
retrieving revision 1.411
diff -u -b -r1.411 Language.php