Refactoring to r89566

Refactor out duplicate code to SpecialPage

diff --git a/includes/SpecialPage.php b/includes/SpecialPage.php
index 2d5f541..d5e6985 100644 (file)
--- a/includes/SpecialPage.php
+++ b/includes/SpecialPage.php
@@ -657,6 +657,23 @@ class SpecialPage {
        public function msg( /* $args */ ) {
                return call_user_func_array( 'wfMessage', func_get_args() )->title( $this->getFullTitle() );
        }
+
+       /**
+        * Adds RSS/atom links
+        *
+        * @param $params array
+        */
+       protected function addFeedLinks( $params ) {
+               global $wgFeedClasses, $wgOut;
+
+               $feedTemplate = wfScript( 'api' ) . '?';
+
+               foreach( $wgFeedClasses as $format => $class ) {
+                       $theseParams = $params + array( 'feedformat' => $format );
+                       $url = $feedTemplate . wfArrayToCGI( $theseParams );
+                       $wgOut->addFeedLink( $format, $url );
+               }
+       }
 }
 
 /**

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 92f4ab3..a9afbc6 100644 (file)
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -116,15 +116,7 @@ class SpecialContributions extends SpecialPage {
                }
 
                // Add RSS/atom links
-               global $wgFeedClasses;
-               $apiParams = array( 'action' => 'feedcontributions', 'user' => $wgUser->getName() );
-               $feedTemplate = wfScript( 'api' ) . '?';
-
-               foreach( $wgFeedClasses as $format => $class ) {
-                       $theseParams = $apiParams + array( 'feedformat' => $format );
-                       $url = $feedTemplate . wfArrayToCGI( $theseParams );
-                       $wgOut->addFeedLink( $format, $url );
-               }
+               $this->addFeedLinks( array( 'action' => 'feedcontributions', 'user' => $wgUser->getName() ) );
 
                if ( wfRunHooks( 'SpecialContributionsBeforeMainOutput', array( $id ) ) ) {
 

diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index 7389b0b..89e9e90 100644 (file)
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -46,16 +46,8 @@ class SpecialWatchlist extends SpecialPage {
                        $wgUser->saveSettings();
                }
 
-               global $wgFeedClasses;
-               $apiParams = array( 'action' => 'feedwatchlist', 'allrev' => 'allrev',
-                                                       'wlowner' => $wgUser->getName(), 'wltoken' => $wlToken );
-               $feedTemplate = wfScript( 'api' ) . '?';
-
-               foreach( $wgFeedClasses as $format => $class ) {
-                       $theseParams = $apiParams + array( 'feedformat' => $format );
-                       $url = $feedTemplate . wfArrayToCGI( $theseParams );
-                       $wgOut->addFeedLink( $format, $url );
-               }
+               $this->addFeedLinks( array( 'action' => 'feedwatchlist', 'allrev' => 'allrev',
+                                                       'wlowner' => $wgUser->getName(), 'wltoken' => $wlToken ) );
 
                $skin = $this->getSkin();
                $wgOut->setRobotPolicy( 'noindex,nofollow' );