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

diff --git a/includes/Exception.php b/includes/Exception.php
index 1db0b02..e801278 100644 (file)
--- 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";
                }
        }
 }