From 5e520e7b59420371e8b882cd3e2e8d5de5ab1064 Mon Sep 17 00:00:00 2001
From: Eric Lippmann <eric.lippmann@netways.de>
Date: Thu, 21 May 2015 16:57:43 +0200
Subject: [PATCH] Don't display a error message as title too

refs #6281
---
 application/controllers/ErrorController.php | 2 --
 application/views/scripts/error/error.phtml | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/application/controllers/ErrorController.php b/application/controllers/ErrorController.php
index ba9b44266..e5e98ee7e 100644
--- a/application/controllers/ErrorController.php
+++ b/application/controllers/ErrorController.php
@@ -63,8 +63,6 @@ class ErrorController extends ActionController
                         $this->getResponse()->setHttpResponseCode(500);
                         break;
                 }
-                $title = preg_replace('/\r?\n.*$/s', '', $exception->getMessage());
-                $this->view->title = 'Server error: ' . $title;
                 $this->view->message = $exception->getMessage();
                 if ($this->getInvokeArg('displayExceptions')) {
                     $this->view->stackTrace = $exception->getTraceAsString();
diff --git a/application/views/scripts/error/error.phtml b/application/views/scripts/error/error.phtml
index d9422474c..5b3480922 100644
--- a/application/views/scripts/error/error.phtml
+++ b/application/views/scripts/error/error.phtml
@@ -1,13 +1,8 @@
 <div class="controls">
 <?= $this->tabs->showOnlyCloseButton() ?>
-<?php if ($this->title): ?>
-<h1><?= $this->escape($title) ?></h1>
-<?php endif ?>
 </div>
 <div class="content">
-<?php if ($this->message): ?>
   <p><strong><?= nl2br($this->escape($message)) ?></strong></p>
-<?php endif ?>
 <?php if (isset($stackTrace)) : ?>
   <hr />
   <pre><?= $this->escape($stackTrace) ?></pre>