From 4853c8a0d2289cfd9b0a9f3f2bd1cd8fb4123530 Mon Sep 17 00:00:00 2001
From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Sun, 17 Apr 2011 10:44:44 +0000
Subject: [PATCH] Tidy up some more uses of SpecialPage static methods

---
 includes/QueryPage.php                     | 6 ++----
 includes/SkinLegacy.php                    | 2 +-
 includes/specials/SpecialContributions.php | 3 +--
 includes/specials/SpecialNewpages.php      | 3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 2dc9ac6394..17a641bcf0 100644
--- a/includes/QueryPage.php
+++ b/includes/QueryPage.php
@@ -687,8 +687,7 @@ abstract class QueryPage extends SpecialPage {
 
 	function feedTitle() {
 		global $wgLanguageCode, $wgSitename;
-		$page = SpecialPage::getPage( $this->getName() );
-		$desc = $page->getDescription();
+		$desc = $this->getDescription();
 		return "$wgSitename - $desc [$wgLanguageCode]";
 	}
 
@@ -697,8 +696,7 @@ abstract class QueryPage extends SpecialPage {
 	}
 
 	function feedUrl() {
-		$title = SpecialPage::getTitleFor( $this->getName() );
-		return $title->getFullURL();
+		return $this->getTitle()->getFullURL();
 	}
 }
 
diff --git a/includes/SkinLegacy.php b/includes/SkinLegacy.php
index e5202bbfb5..50fe82157d 100644
--- a/includes/SkinLegacy.php
+++ b/includes/SkinLegacy.php
@@ -432,7 +432,7 @@ class LegacyTemplate extends BaseTemplate {
 	function specialPagesList() {
 		global $wgContLang, $wgServer, $wgRedirectScript;
 
-		$pages = array_merge( SpecialPage::getRegularPages(), SpecialPage::getRestrictedPages() );
+		$pages = SpecialPage::getUsablePages();
 
 		foreach ( $pages as $name => $page ) {
 			$pages[$name] = $page->getDescription();
diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 73af493311..3dd095b3d6 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -450,8 +450,7 @@ class SpecialContributions extends SpecialPage {
 
 	protected function feedTitle() {
 		global $wgLanguageCode, $wgSitename;
-		$page = SpecialPage::getPage( 'Contributions' );
-		$desc = $page->getDescription();
+		$desc = $this->getDescription();
 		return "$wgSitename - $desc [$wgLanguageCode]";
 	}
 
diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 92fb4fb084..84e4f5565e 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -400,8 +400,7 @@ class SpecialNewpages extends IncludableSpecialPage {
 
 	protected function feedTitle() {
 		global $wgLanguageCode, $wgSitename;
-		$page = SpecialPage::getPage( 'Newpages' );
-		$desc = $page->getDescription();
+		$desc = $this->getDescription();
 		return "$wgSitename - $desc [$wgLanguageCode]";
 	}
 
-- 
2.20.1