tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't display a error message as title too 

refs #6281
This commit is contained in:
Eric Lippmann 2015-05-21 16:57:43 +02:00
parent 03b4de3253
commit 5e520e7b59
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/ErrorController.php
View File

@ -63,8 +63,6 @@ class ErrorController extends ActionController
$this->getResponse()->setHttpResponseCode(500); $this->getResponse()->setHttpResponseCode(500);
break; break;
} }
$title = preg_replace('/\r?\n.*$/s', '', $exception->getMessage());
$this->view->title = 'Server error: ' . $title;
$this->view->message = $exception->getMessage(); $this->view->message = $exception->getMessage();
if ($this->getInvokeArg('displayExceptions')) { if ($this->getInvokeArg('displayExceptions')) {
$this->view->stackTrace = $exception->getTraceAsString(); $this->view->stackTrace = $exception->getTraceAsString();

5
application/views/scripts/error/error.phtml
View File

@ -1,13 +1,8 @@
<div class="controls"> <div class="controls">
<?= $this->tabs->showOnlyCloseButton() ?> <?= $this->tabs->showOnlyCloseButton() ?>
<?php if ($this->title): ?>
<h1><?= $this->escape($title) ?></h1>
<?php endif ?>
</div> </div>
<div class="content"> <div class="content">
<?php if ($this->message): ?>
<p><strong><?= nl2br($this->escape($message)) ?></strong></p> <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
<?php endif ?>
<?php if (isset($stackTrace)) : ?> <?php if (isset($stackTrace)) : ?>
<hr /> <hr />
<pre><?= $this->escape($stackTrace) ?></pre> <pre><?= $this->escape($stackTrace) ?></pre>