Deprecate OutputPage::rateLimited()

Change-Id: I140e6af9dde090b9f8611e7b53a650061f2e84eb

diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25
index b5cade1..862b132 100644 (file)
--- a/RELEASE-NOTES-1.25
+++ b/RELEASE-NOTES-1.25
@@ -58,8 +58,9 @@ changes to languages because of Bugzilla reports.
   since 1.20)
 * Removed 'jquery.json' module. (deprecated since 1.24)
   Use the 'json' module and global JSON object instead.
-* Deprecated OutputPage::readOnlyPage(). Also, it will now throw an MWException
-  if called with one or more arguments.
+* Deprecated OutputPage::readOnlyPage() and OutputPage::rateLimited().
+  Also, the former will now throw an MWException if called with one or more
+  arguments.
 
 == Compatibility ==
 

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 75b1a32..34d3ce6 100644 (file)
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2435,8 +2435,11 @@ class OutputPage extends ContextSource {
        /**
         * Turn off regular page output and return an error response
         * for when rate limiting has triggered.
+        *
+        * @deprecated since 1.25; throw the exception directly
         */
        public function rateLimited() {
+               wfDeprecated( __METHOD__, '1.25' );
                throw new ThrottledError;
        }