From db7c3dc19796bbd4d54868fe20c40f8606970b42 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Mon, 3 Oct 2011 14:21:20 +0000 Subject: [PATCH] Removed call to OutputPage::setSyndicated( true ) just before calling OutputPage::setFeedAppendQuery(); the former is useless when calling the latter --- includes/HistoryPage.php | 1 - includes/specials/SpecialNewpages.php | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php index 8ed41b2a92..11315acfd5 100644 --- a/includes/HistoryPage.php +++ b/includes/HistoryPage.php @@ -88,7 +88,6 @@ class HistoryPage extends ContextSource { $out->setArticleFlag( false ); $out->setArticleRelated( true ); $out->setRobotPolicy( 'noindex,nofollow' ); - $out->setSyndicated( true ); $out->setFeedAppendQuery( 'action=history' ); $out->addModules( array( 'mediawiki.legacy.history', 'mediawiki.action.history' ) ); diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index 5d4a2455f8..019698026e 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -139,11 +139,12 @@ class SpecialNewpages extends IncludableSpecialPage { // Settings $this->form(); - $this->setSyndicated(); $feedType = $this->opts->getValue( 'feed' ); if( $feedType ) { return $this->feed( $feedType ); } + + $out->setFeedAppendQuery( wfArrayToCGI( $this->opts->getAllValues() ) ); } $pager = new NewPagesPager( $this, $this->opts ); @@ -276,12 +277,6 @@ class SpecialNewpages extends IncludableSpecialPage { $this->getOutput()->addHTML( $form ); } - protected function setSyndicated() { - $out = $this->getOutput(); - $out->setSyndicated( true ); - $out->setFeedAppendQuery( wfArrayToCGI( $this->opts->getAllValues() ) ); - } - /** * Format a row, providing the timestamp, links to the page/history, size, user links, and a comment * -- 2.20.1