Tidy up some more uses of SpecialPage static methods

diff --git a/includes/QueryPage.php b/includes/QueryPage.php
index 2dc9ac6..17a641b 100644 (file)
--- 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 e5202bb..50fe821 100644 (file)
--- 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 73af493..3dd095b 100644 (file)
--- 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 92fb4fb..84e4f55 100644 (file)
--- 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]";
        }