Merge "Update wording for RC and Watchlist UI opt-out option"

[lhc/web/wiklou.git] / includes / specialpage / ChangesListSpecialPage.php

diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index 57f7187..1bb995a 100644 (file)
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -836,7 +836,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
        /**
         * Fetch the change tags list for the front end
         *
-        * @return Array Tag data
+        * @return array Tag data
         */
        protected function getChangeTagList() {
                $cache = ObjectCache::getMainWANInstance();
@@ -1279,7 +1279,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                        $this->getOutput()->redirect( $this->getPageTitle()->getCanonicalURL( $query ) );
                }
 
-               $opts->validateIntBounds( 'limit', 0, 5000 );
+               $opts->validateIntBounds( 'limit', 0, 1000 );
                $opts->validateBounds( 'days', 0, $this->getConfig()->get( 'RCMaxAge' ) / ( 3600 * 24 ) );
        }
 
@@ -1395,7 +1395,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
        /**
         * Convert parameters values from true/false to 1/0
         * so they are not omitted by wfArrayToCgi()
-        * Bug 36524
+        * T38524
         *
         * @param array $params
         * @return array
@@ -1591,7 +1591,8 @@ abstract class ChangesListSpecialPage extends SpecialPage {
        }
 
        /**
-        * Send the text to be displayed before the options. Should use $this->getOutput()->addWikiText()
+        * Send the text to be displayed before the options.
+        * Should use $this->getOutput()->addWikiTextAsInterface()
         * or similar methods to print the text.
         *
         * @param FormOptions $opts
@@ -1601,7 +1602,8 @@ abstract class ChangesListSpecialPage extends SpecialPage {
        }
 
        /**
-        * Send the text to be displayed after the options. Should use $this->getOutput()->addWikiText()
+        * Send the text to be displayed after the options.
+        * Should use $this->getOutput()->addWikiTextAsInterface()
         * or similar methods to print the text.
         *
         * @param FormOptions $opts