From: Brian Wolff <bawolff+wn@gmail.com>
Date: Sat, 8 Feb 2014 19:03:50 +0000 (-0400)
Subject: Do not use OutputPage to output exceptions in Installer
X-Git-Tag: 1.31.0-rc.0~16957^2
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=8ffb7299f216c2450e86593453c7ef11f0de40d8;p=lhc%2Fweb%2Fwiklou.git

Do not use OutputPage to output exceptions in Installer

Things don't seem entirely set up correctly with $wgOut's
title object, causing fatals. Seems easier just to output
the exceptions raw.

Bug: 61092
Change-Id: Ifbbe18accdd6abd93365ac041a7f708067d0cf02
---

diff --git a/includes/Exception.php b/includes/Exception.php
index 45b314d733..e91a178f43 100644
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -38,7 +38,8 @@ class MWException extends Exception {
 	function useOutputPage() {
 		return $this->useMessageCache() &&
 			!empty( $GLOBALS['wgFullyInitialised'] ) &&
-			!empty( $GLOBALS['wgOut'] );
+			!empty( $GLOBALS['wgOut'] ) &&
+			!defined( 'MEDIAWIKI_INSTALL' );
 	}
 
 	/**