* Clean up duplicate code for selection of changeslist style

in part for bug 3467

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 0dde4aa..4425932 100644 (file)
--- 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 337767b..50ef66a 100644 (file)
--- 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 72d2a4b..50991be 100644 (file)
--- 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 e35c5a4..fbb745b 100644 (file)
--- 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 7702727..2b99798 100644 (file)
--- 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;