diff options
author | Morris Jobke <hey@morrisjobke.de> | 2016-09-09 15:57:18 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-09 15:57:18 +0300 |
commit | a0d63d4b135115e7af76380c702abea95fa399ee (patch) | |
tree | cb2067c1f370c873ab6ff76e2b075fb59909be23 | |
parent | 36c554718f1d1b1c2604f1bbf2446018e74b5c77 (diff) | |
parent | a4cfb3ddc1f4cdb585e05c0e9b2f8e52a0e2ee3e (diff) |
Merge pull request #1344 from nextcloud/stable9-throw-exceptions-not-printable
[stable9] Don't print exception message in HTML
-rw-r--r-- | apps/dav/lib/files/browsererrorpageplugin.php | 7 | ||||
-rw-r--r-- | apps/dav/templates/exception.php | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/apps/dav/lib/files/browsererrorpageplugin.php b/apps/dav/lib/files/browsererrorpageplugin.php index 8c257b324b9..b58ce4df874 100644 --- a/apps/dav/lib/files/browsererrorpageplugin.php +++ b/apps/dav/lib/files/browsererrorpageplugin.php @@ -31,7 +31,6 @@ use Sabre\DAV\Server; use Sabre\DAV\ServerPlugin; class BrowserErrorPagePlugin extends ServerPlugin { - /** @var Server */ private $server; @@ -88,8 +87,7 @@ class BrowserErrorPagePlugin extends ServerPlugin { /** * @codeCoverageIgnore - * @param \Exception $ex - * @param int $httpCode + * @param \Exception $exception * @return bool|string */ public function generateBody(\Exception $exception) { @@ -109,10 +107,11 @@ class BrowserErrorPagePlugin extends ServerPlugin { return $content->fetchPage(); } - /* + /** * @codeCoverageIgnore */ public function sendResponse() { $this->server->sapi->sendResponse($this->server->httpResponse); + exit(); } } diff --git a/apps/dav/templates/exception.php b/apps/dav/templates/exception.php index 01c4eea4b5a..eb53e4f75aa 100644 --- a/apps/dav/templates/exception.php +++ b/apps/dav/templates/exception.php @@ -6,7 +6,6 @@ style('core', ['styles', 'header']); ?> <span class="error error-wide"> <h2><strong><?php p($_['title']) ?></strong></h2> - <p><?php p($_['message']) ?></p> <br> <h2><strong><?php p($l->t('Technical details')) ?></strong></h2> |