Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib-php/init-website.php b/lib-php/init-website.php
index f2d529800f474bc49853b211731f26de91dc0e6e..6f3b55453f29939ed7e3c9144a4f1e090a6b086b 100644 (file)
--- a/lib-php/init-website.php
+++ b/lib-php/init-website.php
@@ -12,7 +12,7 @@ require_once(CONST_Debug ? 'DebugHtml.php' : 'DebugNone.php');
 
 function userError($sMsg)
 {
 
 function userError($sMsg)
 {

-    throw new Exception($sMsg, 400);
+    throw new \Exception($sMsg, 400);

 }
 
 
 }
 
 


@@ -37,7 +37,7 @@ function shutdown_exception_handler_xml()
 {
     $error = error_get_last();
     if ($error !== null && $error['type'] === E_ERROR) {
 {
     $error = error_get_last();
     if ($error !== null && $error['type'] === E_ERROR) {

-        exception_handler_xml(new Exception($error['message'], 500));
+        exception_handler_xml(new \Exception($error['message'], 500));

     }
 }
 
     }
 }
 


@@ -45,7 +45,7 @@ function shutdown_exception_handler_json()
 {
     $error = error_get_last();
     if ($error !== null && $error['type'] === E_ERROR) {
 {
     $error = error_get_last();
     if ($error !== null && $error['type'] === E_ERROR) {

-        exception_handler_json(new Exception($error['message'], 500));
+        exception_handler_json(new \Exception($error['message'], 500));

     }
 }
 
     }
 }
 


@@ -81,6 +81,10 @@ if (CONST_NoAccessControl) {
         header('Access-Control-Allow-Headers: '.$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
     }
 }
         header('Access-Control-Allow-Headers: '.$_SERVER['HTTP_ACCESS_CONTROL_REQUEST_HEADERS']);
     }
 }

-if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS') exit;
+if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] == 'OPTIONS') {
+    exit;
+}

 
 

-if (CONST_Debug) header('Content-type: text/html; charset=utf-8');
+if (CONST_Debug) {
+    header('Content-type: text/html; charset=utf-8');
+}