Merge "Http::getProxy() method to get proxy configuration"

[lhc/web/wiklou.git] / includes / exception / HttpError.php
diff --git a/includes/exception/HttpError.php b/includes/exception/HttpError.php

index b910ec6..48bc3bd 100644 (file)
--- a/includes/exception/HttpError.php
+++ b/includes/exception/HttpError.php
@@ -88,11 +88,11 @@ class HttpError extends MWException {
                         $content = $content->text();
                 }
  
-               $context = array(
+               $context = [
                         'file' => $this->getFile(),
                         'line' => $this->getLine(),
                         'http_code' => $this->httpCode,
-               );
+               ];
  
                 $logMsg = "$content ({http_code}) from {file}:{line}";
  
@@ -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 "<!DOCTYPE html>\n" .