From c97b528a728e98cd7057dc0c6ce9489bde2c6060 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bartosz=20Dziewo=C5=84ski?= <matma.rex@gmail.com>
Date: Tue, 4 Feb 2014 16:37:33 +0100
Subject: [PATCH] Don't override the 'limit' parameter when building feed query

Calling mutating functions is not cool here.

Bug: 60795
Change-Id: I7dff8a9c6f97cbeddd42603982ce923aa4388bc8
---
 includes/specials/SpecialRecentchanges.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 7352de7674..d266e3f2cb 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -506,7 +506,6 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 	public function getFeedQuery() {
 		global $wgFeedLimit;
 
-		$this->getOptions()->validateIntBounds( 'limit', 0, $wgFeedLimit );
 		$options = $this->getOptions()->getChangedValues();
 
 		// wfArrayToCgi() omits options set to null or false
@@ -517,6 +516,10 @@ class SpecialRecentChanges extends ChangesListSpecialPage {
 		}
 		unset( $value );
 
+		if ( isset( $options['limit'] ) && $options['limit'] > $wgFeedLimit ) {
+			$options['limit'] = $wgFeedLimit;
+		}
+
 		return wfArrayToCgi( $options );
 	}
 
-- 
2.20.1