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 "resourceloader: Use "\n" instead of ";" as separator for scripts"
[lhc/web/wiklou.git]
/
includes
/
MediaWiki.php
diff --git
a/includes/MediaWiki.php
b/includes/MediaWiki.php
index
b18414d
..
364ed86
100644
(file)
--- a/
includes/MediaWiki.php
+++ b/
includes/MediaWiki.php
@@
-898,12
+898,11
@@
class MediaWiki {
__METHOD__
);
__METHOD__
);
+ // Important: this must be the last deferred update added (T100085, T154425)
+ DeferredUpdates::addCallableUpdate( [ JobQueueGroup::class, 'pushLazyJobs' ] );
+
// Do any deferred jobs
DeferredUpdates::doUpdates( 'enqueue' );
// Do any deferred jobs
DeferredUpdates::doUpdates( 'enqueue' );
- DeferredUpdates::setImmediateMode( true );
-
- // Make sure any lazy jobs are pushed
- JobQueueGroup::pushLazyJobs();
// Now that everything specific to this request is done,
// try to occasionally run jobs (if enabled) from the queues
// Now that everything specific to this request is done,
// try to occasionally run jobs (if enabled) from the queues