From: Aaron Schulz <aschulz@wikimedia.org>
Date: Mon, 29 Aug 2016 00:01:55 +0000 (-0700)
Subject: Include PRESEND updates in ChronologyProtector positions
X-Git-Tag: 1.31.0-rc.0~5838^2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=2991f01032e61966f4d72d857a7570c107e58f8c;p=lhc%2Fweb%2Fwiklou.git

Include PRESEND updates in ChronologyProtector positions

This updates are PRESEND for reason, so users should see them
on the next page view. Otherwise, they would be POSTSEND.

Change-Id: I533de550f6dd3e4b75507c2d25b1a05f7ac1301d
---

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 2a00900b06..4c48f368df 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -571,13 +571,14 @@ class MediaWiki {
 			// Abort if any transaction was too big
 			[ 'maxWriteDuration' => $config->get( 'MaxUserDBWriteDuration' ) ]
 		);
-		// Record ChronologyProtector positions
-		$factory->shutdown();
-		wfDebug( __METHOD__ . ': all transactions committed' );
 
 		DeferredUpdates::doUpdates( 'enqueue', DeferredUpdates::PRESEND );
 		wfDebug( __METHOD__ . ': pre-send deferred updates completed' );
 
+		// Record ChronologyProtector positions
+		$factory->shutdown();
+		wfDebug( __METHOD__ . ': all transactions committed' );
+
 		// Set a cookie to tell all CDN edge nodes to "stick" the user to the DC that handles this
 		// POST request (e.g. the "master" data center). Also have the user briefly bypass CDN so
 		// ChronologyProtector works for cacheable URLs.