From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 12 Sep 2008 17:01:41 +0000 (+0000)
Subject: Don't hang up page views with jobs
X-Git-Tag: 1.31.0-rc.0~45347
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=4689cf11fe6a853d0105ff7c1e91e9b9e7f36ae5;p=lhc%2Fweb%2Fwiklou.git

Don't hang up page views with jobs
---

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 101ba7f2b4..c87f07826c 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -328,12 +328,16 @@ class MediaWiki {
 	 */
 	function finalCleanup ( &$deferredUpdates, &$output ) {
 		wfProfileIn( __METHOD__ );
-		$this->doUpdates( $deferredUpdates );
-		$this->doJobs();
 		# Now commit any transactions, so that unreported errors after output() don't roll back the whole thing
 		$factory = wfGetLBFactory();
-		$factory->shutdown();
+		$factory->commitMasterChanges();
+		# Output everything!
 		$output->output();
+		# Do any deferred jobs
+		$this->doUpdates( $deferredUpdates );
+		$this->doJobs();
+		# Commit and close up!
+		$factory->shutdown();
 		wfProfileOut( __METHOD__ );
 	}