Removed call to OutputPage::setSyndicated( true ) just before calling OutputPage...

diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php
index 8ed41b2..11315ac 100644 (file)
--- 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 5d4a245..0196980 100644 (file)
--- 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
         *