(bug 7830) Pending transactions failed to commit on loginToUse() error

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c1f3cab..0c5f2a7 100644 (file)
--- 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 24a9955..d873b9f 100644 (file)
--- 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;
                }