From 3eac5844067c006c0b1d05daa5b4d46dbc515ad7 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Thu, 15 Sep 2005 00:40:51 +0000
Subject: [PATCH] * Clean up duplicate code for selection of changeslist style
 in part for bug 3467

---
 RELEASE-NOTES                           | 2 ++
 includes/ChangesList.php                | 9 +++++++++
 includes/SpecialRecentchanges.php       | 6 +-----
 includes/SpecialRecentchangeslinked.php | 6 +-----
 includes/SpecialWatchlist.php           | 8 +-------
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0dde4aa1ab..4425932b48 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -107,6 +107,8 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 3412) Clean up date format handling so ~~~~-sigs work with default
   format as designed. Documentation comments updated.
 * (bug 1423) LanguageJa.php update
+* Clean up duplicate code for selection of changeslist style
+
 
 === Caveats ===
 
diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 337767b43a..50ef66ad1d 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -19,6 +19,15 @@ class ChangesList {
 		$this->skin =& $skin;
 		$this->preCacheMessages();
 	}
+	
+	function newFromUser( &$user ) {
+		$sk =& $user->getSkin();
+		if ( $user->getOption('usenewrc') ) {
+			return new EnhancedChangesList( $sk );
+		} else {
+			return new OldChangesList( $sk );
+		}
+	}
 
 	/**
 	 * As we use the same small set of messages in various methods and that
diff --git a/includes/SpecialRecentchanges.php b/includes/SpecialRecentchanges.php
index 72d2a4b53a..50991becc5 100644
--- a/includes/SpecialRecentchanges.php
+++ b/includes/SpecialRecentchanges.php
@@ -196,11 +196,7 @@ function wfSpecialRecentchanges( $par, $specialPage ) {
 		$sk = $wgUser->getSkin();
 		$wgOut->setSyndicated( true );
 
-		if ( $wgUser->getOption('usenewrc') ) {
-			$list =& new EnhancedChangesList( $sk );
-		} else {
-			$list =& new OldChangesList( $sk );
-		}
+		$list = ChangesList::newFromUser( $wgUser );
 
 		$s = $list->beginRecentChangesList();
 		$counter = 1;
diff --git a/includes/SpecialRecentchangeslinked.php b/includes/SpecialRecentchangeslinked.php
index e35c5a4616..fbb745b79b 100644
--- a/includes/SpecialRecentchangeslinked.php
+++ b/includes/SpecialRecentchangeslinked.php
@@ -112,11 +112,7 @@ ORDER BY rev_timestamp DESC
 
 	$wgOut->addHTML( $note."\n" );
 
-	if ( $wgUser->getOption('usenewrc') ) {
-		$list =& new EnhancedChangesList( $sk );
-	} else {
-		$list =& new OldChangesList( $sk );
-	}
+	$list = ChangesList::newFromUser( $wgUser );
 	$s = $list->beginRecentChangesList();
 	$count = $dbr->numRows( $res );
 	
diff --git a/includes/SpecialWatchlist.php b/includes/SpecialWatchlist.php
index 770272752b..2b997986f2 100644
--- a/includes/SpecialWatchlist.php
+++ b/includes/SpecialWatchlist.php
@@ -293,13 +293,7 @@ function wfSpecialWatchlist( $par ) {
 	$wgOut->addHTML( "</p>\n" );
 	/* End bottom header */
 
-	$sk = $wgUser->getSkin();
-
-	if ( $wgUser->getOption('usenewrc') ) {
-		$list =& new EnhancedChangesList( $sk );
-	} else {
-		$list =& new OldChangesList( $sk );
-	}
+	$list = ChangesList::newFromUser( $wgUser );
 
 	$s = $list->beginRecentChangesList();
 	$counter = 1;
-- 
2.20.1