From: Happy-melon <happy-melon@users.mediawiki.org>
Date: Sat, 7 May 2011 13:24:47 +0000 (+0000)
Subject: (bug 28834) Restore nl2br() wrappers removed in r85918.
X-Git-Tag: 1.31.0-rc.0~30350
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=84f048c68a4c5336975bc72a3fbb8ecbc910e5f4;p=lhc%2Fweb%2Fwiklou.git

(bug 28834) Restore nl2br() wrappers removed in r85918.
---

diff --git a/includes/Exception.php b/includes/Exception.php
index 1db0b029b4..e8012782af 100644
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -493,7 +493,7 @@ function wfReportException( Exception $e ) {
 			if ( $cmdLine ) {
 				wfPrintError( $message );
 			} else {
-				wfDie( htmlspecialchars( $message ) ) . "\n";
+				wfDie( nl2br( htmlspecialchars( $message ) ) ) . "\n";
 			}
 		}
 	} else {
@@ -507,7 +507,7 @@ function wfReportException( Exception $e ) {
 		if ( $cmdLine ) {
 			wfPrintError( $message );
 		} else {
-			wfDie( htmlspecialchars( $message ) ) . "\n";
+			wfDie( nl2br( htmlspecialchars( $message ) ) ) . "\n";
 		}
 	}
 }