dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Use pg_result_error, not pg_last_error, as the latter gives false negatives."
[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();
}
$content = $content->text();
}
- $context =
array(
+ $context =
[
'file' => $this->getFile(),
'line' => $this->getLine(),
'http_code' => $this->httpCode,
'file' => $this->getFile(),
'line' => $this->getLine(),
'http_code' => $this->httpCode,
-
)
;
+
]
;
$logMsg = "$content ({http_code}) from {file}:{line}";
$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 {
if ( $this->content instanceof Message ) {
$contentHtml = $this->content->escaped();
} else {
- $contentHtml =
htmlspecialchars( $this->content
);
+ $contentHtml =
nl2br( htmlspecialchars( $this->content )
);
}
return "<!DOCTYPE html>\n" .
}
return "<!DOCTYPE html>\n" .