From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Mon, 3 Oct 2011 14:21:20 +0000 (+0000)
Subject: Removed call to OutputPage::setSyndicated( true ) just before calling OutputPage... 
X-Git-Tag: 1.31.0-rc.0~27289
X-Git-Url: http://git.cyclocoop.org/%22.%24info%5B?a=commitdiff_plain;h=db7c3dc19796bbd4d54868fe20c40f8606970b42;p=lhc%2Fweb%2Fwiklou.git

Removed call to OutputPage::setSyndicated( true ) just before calling OutputPage::setFeedAppendQuery(); the former is useless when calling the latter
---

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
 	 *