From 2d921487e4b2c3531a88e88d525d0f72bfbebefe Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Fri, 10 Apr 2009 14:27:29 +0000
Subject: [PATCH] (bug 7830) Pending transactions failed to commit on
 loginToUse() error

---
 RELEASE-NOTES     | 1 +
 includes/Wiki.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c1f3cabc08..0c5f2a7823 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -334,6 +334,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 18377) Time in Enhanced ChangesList lacking localisation
 * (bug 12998) Allow <sup>, <sub>, etc. in DISPLAYTITLE
 * (bug 1553) Lowercase navigation headings in German
+* (bug 7830) Pending transactions failed to commit on loginToUse() error
 
 == API changes in 1.15 ==
 * (bug 16858) Revamped list=deletedrevs to make listing deleted contributions
diff --git a/includes/Wiki.php b/includes/Wiki.php
index 24a99551db..d873b9f20c 100644
--- a/includes/Wiki.php
+++ b/includes/Wiki.php
@@ -152,8 +152,9 @@ class MediaWiki {
 		# the Read array in order for the user to see it. (We have to check here to
 		# catch special pages etc. We check again in Article::view())
 		if( !is_null( $title ) && !$title->userCanRead() ) {
+			global $wgDeferredUpdateList;
 			$output->loginToUse();
-			$output->output();
+			$this->finalCleanup( $wgDeferredUpdateList, $output );
 			$output->disable();
 			return false;
 		}
-- 
2.20.1