X-Git-Url: https://git.cyclocoop.org/%20%27.%28%24debut%20%20%20%24par_page%29.%27?a=blobdiff_plain;f=includes%2FMediaWiki.php;h=1a75714fbc53247dc915220c47c3912e82cce69d;hb=f725f4182a7b44a311761207cd95541c33f6abd7;hp=28c9e16002d5f69af23f70a2e0e99208d521c70f;hpb=eda773a437933f2126d84a23c71b177820be3e32;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 28c9e16002..1a75714fbc 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -526,11 +526,15 @@ class MediaWiki {
 			try {
 				$this->main();
 			} catch ( ErrorPageError $e ) {
+				$out = $this->context->getOutput();
+				// TODO: Should ErrorPageError::report accept a OutputPage parameter?
+				$e->report( ErrorPageError::STAGE_OUTPUT );
+
 				// T64091: while exceptions are convenient to bubble up GUI errors,
 				// they are not internal application faults. As with normal requests, this
 				// should commit, print the output, do deferred updates, jobs, and profiling.
 				$this->doPreOutputCommit();
-				$e->report(); // display the GUI error
+				$out->output(); // display the GUI error
 			}
 		} catch ( Exception $e ) {
 			$context = $this->context;