X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/eebc72b2bc4a653ed7fef8900edc6e2b0295d001..77e287f66918296b9461470a7846e22ec1f36a08:/lib/init-website.php

diff --git a/lib/init-website.php b/lib/init-website.php
index 23c15ba8..f2d52980 100644
--- a/lib/init-website.php
+++ b/lib/init-website.php
@@ -16,19 +16,11 @@ 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());
     header('Content-type: application/json; charset=utf-8');
-    include(CONST_BasePath.'/lib/template/error-json.php');
+    include(CONST_LibDir.'/template/error-json.php');
     exit();
 }
 
@@ -37,18 +29,10 @@ function exception_handler_xml($exception)
     http_response_code($exception->getCode());
     header('Content-type: text/xml; charset=utf-8');
     echo '<?xml version="1.0" encoding="UTF-8" ?>'."\n";
-    include(CONST_BasePath.'/lib/template/error-xml.php');
+    include(CONST_LibDir.'/template/error-xml.php');
     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');