From a1789ddde42033f1b05cc4929491214ee6e79383 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 17 Dec 2015 09:15:42 +0100
Subject: Update to MediaWiki 1.26.0

---
 includes/exception/MWException.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'includes/exception/MWException.php')

diff --git a/includes/exception/MWException.php b/includes/exception/MWException.php
index 478fead1..c0186f9f 100644
--- a/includes/exception/MWException.php
+++ b/includes/exception/MWException.php
@@ -238,8 +238,7 @@ class MWException extends Exception {
 		} elseif ( self::isCommandLine() ) {
 			MWExceptionHandler::printError( $this->getText() );
 		} else {
-			self::header( 'HTTP/1.1 500 MediaWiki exception' );
-			self::header( 'Status: 500 MediaWiki exception' );
+			self::statusHeader( 500 );
 			self::header( "Content-Type: $wgMimeType; charset=utf-8" );
 
 			$this->reportHTML();
@@ -266,4 +265,9 @@ class MWException extends Exception {
 			header( $header );
 		}
 	}
+	private static function statusHeader( $code ) {
+		if ( !headers_sent() ) {
+			HttpStatus::header( $code );
+		}
+	}
 }
-- 
cgit v1.2.3-54-g00ecf