actions: run tests also on postgresql 9.5

[nominatim.git] / lib / init-website.php

diff --git a/lib/init-website.php b/lib/init-website.php
index 23c15ba81b3b3dc0253c0d26fc88cc2a282b8dc8..302a94787cc834e2468c0959b8e4a2c5bf8edbf3 100644 (file)
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -16,14 +16,6 @@ function userError($sMsg)
 }
 
 
-function exception_handler_html($exception)
-{
-    http_response_code($exception->getCode());
-    header('Content-type: text/html; charset=UTF-8');
-    include(CONST_BasePath.'/lib/template/error-html.php');
-    exit();
-}
-
 function exception_handler_json($exception)
 {
     http_response_code($exception->getCode());
@@ -41,14 +33,6 @@ function exception_handler_xml($exception)
     exit();
 }
 
-function shutdown_exception_handler_html()
-{
-    $error = error_get_last();
-    if ($error !== null && $error['type'] === E_ERROR) {
-        exception_handler_html(new Exception($error['message'], 500));
-    }
-}
-
 function shutdown_exception_handler_xml()
 {
     $error = error_get_last();
@@ -73,10 +57,7 @@ function set_exception_handler_by_format($sFormat = null)
     // one by default without an explicit $sFormat set.
 
     if (!isset($sFormat)) {
-        set_exception_handler('exception_handler_html');
-    } elseif ($sFormat == 'html') {
-        set_exception_handler('exception_handler_html');
-        register_shutdown_function('shutdown_exception_handler_html');
+        set_exception_handler('exception_handler_json');
     } elseif ($sFormat == 'xml') {
         set_exception_handler('exception_handler_xml');
         register_shutdown_function('shutdown_exception_handler_xml');