From f51c4da96c05efeaeb1c0514dc03a55f756876f5 Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Wed, 4 Apr 2012 22:51:51 +0200 Subject: [PATCH] Removed "feed" parameter to query string added to feed links. The "feed" parameter was set two times in the query string of feed links and thus was breaking the links. Also removed a trailing whitespace pointed out by Krinkle in my last commit. Change-Id: Ia210e6e998acf29cb0a0fad5b6f7f8d6062998d2 --- includes/specials/SpecialNewpages.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php index 29aa659eb9..1bcbac7935 100644 --- a/includes/specials/SpecialNewpages.php +++ b/includes/specials/SpecialNewpages.php @@ -143,7 +143,9 @@ class SpecialNewpages extends IncludableSpecialPage { return $this->feed( $feedType ); } - $out->setFeedAppendQuery( wfArrayToCGI( $this->opts->getAllValues() ) ); + $allValues = $this->opts->getAllValues(); + unset( $allValues['feed'] ); + $out->setFeedAppendQuery( wfArrayToCGI( $allValues ) ); } $pager = new NewPagesPager( $this, $this->opts ); @@ -370,7 +372,7 @@ class SpecialNewpages extends IncludableSpecialPage { $oldTitleText = ''; $oldTitle = Title::makeTitle( $result->rc_namespace, $result->rc_title ); if ( !$title->equals( $oldTitle ) ) { - $oldTitleText = $this->msg( 'rc-old-title' )->params( $oldTitle->getPrefixedText() )->escaped(); + $oldTitleText = $this->msg( 'rc-old-title' )->params( $oldTitle->getPrefixedText() )->escaped(); } return "{$time} {$dm}{$plink} {$hist} {$dm}{$length} {$dm}{$ulink} {$comment} {$tagDisplay} {$oldTitleText}\n"; -- 2.20.1