X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FMediaWiki.php;h=1a75714fbc53247dc915220c47c3912e82cce69d;hb=18c2d20c54f9851af639cb24603493ca197baaa8;hp=f91477af2e2b31633e143710d94af3c4800875f5;hpb=f2d3caf5bcab177c872d5290ac5354bbf1f0967c;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index f91477af2e..1a75714fbc 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -346,6 +346,10 @@ class MediaWiki {
 			return false;
 		}
 
+		if ( $this->config->get( 'MainPageIsDomainRoot' ) && $request->getRequestURL() === '/' ) {
+			return false;
+		}
+
 		if ( $title->isSpecialPage() ) {
 			list( $name, $subpage ) = MediaWikiServices::getInstance()->getSpecialPageFactory()->
 				resolveAlias( $title->getDBkey() );
@@ -522,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;