From 7613c75b0aca7680b78307716f2ae83956a3d734 Mon Sep 17 00:00:00 2001
From: Bryan Tong Minh <btongminh@users.mediawiki.org>
Date: Fri, 17 Jun 2011 16:42:58 +0000
Subject: [PATCH] Per comments revert r88904 and remove session_write_close
 entirely. This will leave async uploads broken until somebody writes a way to
 interact with the session per comments on r87235.

---
 includes/Wiki.php | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/includes/Wiki.php b/includes/Wiki.php
index 3a1d88127e..295c5e22a9 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -333,7 +333,6 @@ class MediaWiki {
 		$this->context->getOutput()->output();
 		// Do any deferred jobs
 		wfDoUpdates( 'commit' );
-
 		$this->doJobs();
 		wfProfileOut( __METHOD__ );
 	}
@@ -357,10 +356,6 @@ class MediaWiki {
 			$n = intval( $wgJobRunRate );
 		}
 
-		// Close the session so that jobs don't access the current session
-		$this->shutdownLBFactory();
-		session_write_close();
-
 		while ( $n-- && false != ( $job = Job::pop() ) ) {
 			$output = $job->toString() . "\n";
 			$t = -wfTime();
@@ -382,20 +377,11 @@ class MediaWiki {
 	public function restInPeace() {
 		MessageCache::logMessages();
 		wfLogProfilingData();
-		$this->shutdownLBFactory();
-		wfDebug( "Request ended normally\n" );
-	}
-
-	/**
-	 * Commit pending master changes, shutdown the current loadbalancer
-	 * factory and destroys the factory instance.
-	 */
-	private function shutdownLBFactory() {
 		// Commit and close up!
-		$factory = LBFactory::singleton();
+		$factory = wfGetLBFactory();
 		$factory->commitMasterChanges();
 		$factory->shutdown();
-		LBFactory::destroyInstance();
+		wfDebug( "Request ended normally\n" );
 	}
 
 	/**
-- 
2.20.1