dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "mw.action.history.diff: Remove higher than necessary specific selectors"
[lhc/web/wiklou.git]
/
includes
/
deferred
/
DeferredUpdates.php
diff --git
a/includes/deferred/DeferredUpdates.php
b/includes/deferred/DeferredUpdates.php
index
bbe8687
..
9f5b31a
100644
(file)
--- a/
includes/deferred/DeferredUpdates.php
+++ b/
includes/deferred/DeferredUpdates.php
@@
-55,8
+55,6
@@
class DeferredUpdates {
private static $preSendUpdates = [];
/** @var DeferrableUpdate[] Updates to be deferred until after request end */
private static $postSendUpdates = [];
private static $preSendUpdates = [];
/** @var DeferrableUpdate[] Updates to be deferred until after request end */
private static $postSendUpdates = [];
- /** @var bool Whether to just run updates in addUpdate() */
- private static $immediateMode = false;
const ALL = 0; // all updates; in web requests, use only after flushing the output buffer
const PRESEND = 1; // for updates that should run before flushing output buffer
const ALL = 0; // all updates; in web requests, use only after flushing the output buffer
const PRESEND = 1; // for updates that should run before flushing output buffer
@@
-90,12
+88,6
@@
class DeferredUpdates {
self::push( self::$postSendUpdates, $update );
}
self::push( self::$postSendUpdates, $update );
}
- if ( self::$immediateMode ) {
- // No more explicit doUpdates() calls will happen, so run this now
- self::doUpdates( 'run' );
- return;
- }
-
// Try to run the updates now if in CLI mode and no transaction is active.
// This covers scripts that don't/barely use the DB but make updates to other stores.
if ( $wgCommandLineMode ) {
// Try to run the updates now if in CLI mode and no transaction is active.
// This covers scripts that don't/barely use the DB but make updates to other stores.
if ( $wgCommandLineMode ) {
@@
-140,9
+132,10
@@
class DeferredUpdates {
/**
* @param bool $value Whether to just immediately run updates in addUpdate()
* @since 1.28
/**
* @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 ) {
*/
public static function setImmediateMode( $value ) {
-
self::$immediateMode = (bool)$value
;
+
wfDeprecated( __METHOD__, '1.29' )
;
}
/**
}
/**