Don't override the 'limit' parameter when building feed query

Calling mutating functions is not cool here.

Bug: 60795
Change-Id: I7dff8a9c6f97cbeddd42603982ce923aa4388bc8

diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 7352de7..d266e3f 100644 (file)
--- 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 );
        }