[Koha-patches] [PATCH] Bug 4514 (Error handling in 500.pl is erroneous itself)

[Marcel de Rooy]

---
 errors/500.pl                                      |    3 ++-
 .../opac-tmpl/prog/en/modules/errors/500.tmpl      |    2 +-
 opac/errors/500.pl                                 |    2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/errors/500.pl b/errors/500.pl
index 6f570a2..a15e48e 100755
--- a/errors/500.pl
+++ b/errors/500.pl
@@ -34,4 +34,5 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error';
+output_html_with_http_headers $query, $cookie, $template->output; #, 'html', '500 Internal Server Error';
+
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl
index 27121ff..f96e407 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl
@@ -10,7 +10,7 @@
         <div id="yui-main">
         <div class="yui-b"><div class="yui-g">
             <h3>An Error has Occurred</h3>
-            <h4>Error 404</h4>
+            <h4>Error 500</h4>
             <ul>
                 <li>An error occurred while try to process your request.</li>
                 <li>To report this error, you can 
diff --git a/opac/errors/500.pl b/opac/errors/500.pl
index fb0350e..cae7746 100755
--- a/opac/errors/500.pl
+++ b/opac/errors/500.pl
@@ -34,4 +34,4 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
     }
 );
 $template->param( admin => $admin );
-output_with_http_headers $query, $cookie, $template->output, 'html', '500 Internal Server Error';
+output_html_with_http_headers $query, $cookie, $template->output; #, 'html', '500 Internal Server Error';
-- 
1.6.0.6