Merge "Convert article delete to use OOUI"

[lhc/web/wiklou.git] / includes / MediaWiki.php

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index a7214c7..4df4d76 100644 (file)
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -539,13 +539,12 @@ class MediaWiki {
                                HTMLFileCache::useFileCache( $this->context, HTMLFileCache::MODE_OUTAGE )
                        ) {
                                // Try to use any (even stale) file during outages...
-                               $cache = new HTMLFileCache( $context->getTitle(), 'view' );
+                               $cache = new HTMLFileCache( $context->getTitle(), $action );
                                if ( $cache->isCached() ) {
                                        $cache->loadFromFileCache( $context, HTMLFileCache::MODE_OUTAGE );
                                        print MWExceptionRenderer::getHTML( $e );
                                        exit;
                                }
-
                        }
 
                        MWExceptionHandler::handleException( $e );
@@ -720,21 +719,28 @@ class MediaWiki {
         * @since 1.26
         */
        public function doPostOutputShutdown( $mode = 'normal' ) {
-               $timing = $this->context->getTiming();
-               $timing->mark( 'requestShutdown' );
-
-               // Show visible profiling data if enabled (which cannot be post-send)
-               Profiler::instance()->logDataPageOutputOnly();
+               // Perform the last synchronous operations...
+               try {
+                       // Record backend request timing
+                       $timing = $this->context->getTiming();
+                       $timing->mark( 'requestShutdown' );
+                       // Show visible profiling data if enabled (which cannot be post-send)
+                       Profiler::instance()->logDataPageOutputOnly();
+               } catch ( Exception $e ) {
+                       // An error may already have been shown in run(), so just log it to be safe
+                       MWExceptionHandler::rollbackMasterChangesAndLog( $e );
+               }
 
+               // Defer everything else if possible...
                $callback = function () use ( $mode ) {
                        try {
                                $this->restInPeace( $mode );
                        } catch ( Exception $e ) {
-                               MWExceptionHandler::handleException( $e );
+                               // If this is post-send, then displaying errors can cause broken HTML
+                               MWExceptionHandler::rollbackMasterChangesAndLog( $e );
                        }
                };
 
-               // Defer everything else...
                if ( function_exists( 'register_postsend_function' ) ) {
                        // https://github.com/facebook/hhvm/issues/1230
                        register_postsend_function( $callback );
@@ -815,7 +821,6 @@ class MediaWiki {
 
                        // ATTENTION: This hook is likely to be removed soon due to overall design of the system.
                        if ( Hooks::run( 'BeforeHttpsRedirect', [ $this->context, &$redirUrl ] ) ) {
-
                                if ( $request->wasPosted() ) {
                                        // This is weird and we'd hope it almost never happens. This
                                        // means that a POST came in via HTTP and policy requires us
@@ -898,12 +903,12 @@ class MediaWiki {
                        __METHOD__
                );
 
+               // Important: this must be the last deferred update added (T100085, T154425)
+               DeferredUpdates::addCallableUpdate( [ JobQueueGroup::class, 'pushLazyJobs' ] );
+
                // Do any deferred jobs
                DeferredUpdates::doUpdates( 'enqueue' );
 
-               // Make sure any lazy jobs are pushed
-               JobQueueGroup::pushLazyJobs();
-
                // Now that everything specific to this request is done,
                // try to occasionally run jobs (if enabled) from the queues
                if ( $mode === 'normal' ) {