Merge "Drop DeferredUpdates::setImmediateMode(), deprecated since 1.29"

diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index bb7022f..0008fb9 100644 (file)
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -342,6 +342,7 @@ because of Phabricator reports.
   assert a newer version of PHP than MediaWiki does, use extension registration.
 * The hook 'ChangesListSpecialPageFilters', deprecated in 1.29, has now been
   removed. Use the 'ChangesListSpecialPageStructuredFilters' hook instead.
+* DeferredUpdates::setImmediateMode(), deprecated since 1.29, has been removed.
 
 === Deprecations in 1.32 ===
 * HTMLForm::setSubmitProgressive() is deprecated. No need to call it. Submit

diff --git a/includes/deferred/DeferredUpdates.php b/includes/deferred/DeferredUpdates.php
index 8543c4b..e6a0e81 100644 (file)
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -135,15 +135,6 @@ class DeferredUpdates {
                }
        }
 
-       /**
-        * @param bool $value Whether to just immediately run updates in addUpdate()
-        * @since 1.28
-        * @deprecated 1.29 Causes issues in Web-executed jobs - see T165714 and T100085.
-        */
-       public static function setImmediateMode( $value ) {
-               wfDeprecated( __METHOD__, '1.29' );
-       }
-
        /**
         * @param DeferrableUpdate[] $queue
         * @param DeferrableUpdate $update