From: Timo Tijhof Date: Wed, 16 Sep 2015 17:22:35 +0000 (+0100) Subject: HttpError: Convert line breaks in text message to
X-Git-Tag: 1.31.0-rc.0~9979^2 X-Git-Url: http://git.cyclocoop.org/%40spipnet%40?a=commitdiff_plain;h=fc206806d8b19d796b769a87419e9a21ef078bd4;p=lhc%2Fweb%2Fwiklou.git HttpError: Convert line breaks in text message to
Used by MediaWiki::tryNormaliseRedirect() for example with plain text containing line breaks. Change-Id: I5949046af4065c5536080212b96374466849b91a --- diff --git a/includes/exception/HttpError.php b/includes/exception/HttpError.php index b910ec629d..9211bf8267 100644 --- a/includes/exception/HttpError.php +++ b/includes/exception/HttpError.php @@ -121,7 +121,7 @@ class HttpError extends MWException { if ( $this->content instanceof Message ) { $contentHtml = $this->content->escaped(); } else { - $contentHtml = htmlspecialchars( $this->content ); + $contentHtml = nl2br( htmlspecialchars( $this->content ) ); } return "\n" .