diff --git a/RELEASE-NOTES-1.36 b/RELEASE-NOTES-1.36 index aa58856b32b..464e93ab206 100644 --- a/RELEASE-NOTES-1.36 +++ b/RELEASE-NOTES-1.36 @@ -88,6 +88,7 @@ because of Phabricator reports. * Multiple methods that fell back to the $wgUser global variable were individually hard deprecated previously. The following have now been removed: - ApiTestCase::doLogin + - WebRequest::getLimitOffset - All methods of the old SpecialPageFactory; the entire class was removed * The global function `wfWaitForSlaves`, deprecated in 1.27 and hard-deprecated in 1.35, has been removed. Use LBFactory::waitForReplication() instead. diff --git a/includes/WebRequest.php b/includes/WebRequest.php index ac55308af17..21e331f9ca5 100644 --- a/includes/WebRequest.php +++ b/includes/WebRequest.php @@ -998,22 +998,6 @@ class WebRequest { return wfArrayToCgi( $newquery ); } - /** - * Same as ::getLimitOffsetForUser, but without a user parameter, instead using $wgUser - * - * @deprecated since 1.35, use ::getLimitOffsetForUser instead - * - * @param int $deflimit Limit to use if no input and the user hasn't set the option. - * @param string $optionname To specify an option other than rclimit to pull from. - * @return int[] First element is limit, second is offset - */ - public function getLimitOffset( $deflimit = 50, $optionname = 'rclimit' ) { - wfDeprecated( __METHOD__, '1.35' ); - - global $wgUser; - return $this->getLimitOffsetForUser( $wgUser, $deflimit, $optionname ); - } - /** * Check for limit and offset parameters on the input, and return sensible * defaults if not given. The limit must be positive and is capped at 5000.