Merge remote-tracking branch 'upstream/master'

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

diff --git a/lib-php/website/status.php b/lib-php/website/status.php
index 7c7eb9281c5e449fb09a52f18ce8c1153273e7e7..03e56f655439aa6b13aeb132b92dcb247de190a6 100644 (file)
--- a/lib-php/website/status.php
+++ b/lib-php/website/status.php
@@ -17,6 +17,23 @@ if ($sOutputFormat == 'json') {
 try {
     $oStatus = new Nominatim\Status($oDB);
     $oStatus->status();
 try {
     $oStatus = new Nominatim\Status($oDB);
     $oStatus->status();

+
+    if ($sOutputFormat == 'json') {
+        $epoch = $oStatus->dataDate();
+        $aResponse = array(
+                      'status' => 0,
+                      'message' => 'OK',
+                      'data_updated' => (new DateTime('@'.$epoch))->format(DateTime::RFC3339),
+                      'software_version' => CONST_NominatimVersion
+                     );
+        $sDatabaseVersion = $oStatus->databaseVersion();
+        if ($sDatabaseVersion) {
+            $aResponse['database_version'] = $sDatabaseVersion;
+        }
+        javascript_renderData($aResponse);
+    } else {
+        echo 'OK';
+    }

 } catch (Exception $oErr) {
     if ($sOutputFormat == 'json') {
         $aResponse = array(
 } catch (Exception $oErr) {
     if ($sOutputFormat == 'json') {
         $aResponse = array(


@@ -28,25 +45,4 @@ try {
         header('HTTP/1.0 500 Internal Server Error');
         echo 'ERROR: '.$oErr->getMessage();
     }
         header('HTTP/1.0 500 Internal Server Error');
         echo 'ERROR: '.$oErr->getMessage();
     }

-    exit;

 }
 }

-
-
-if ($sOutputFormat == 'json') {
-    $epoch = $oStatus->dataDate();
-    $aResponse = array(
-                  'status' => 0,
-                  'message' => 'OK',
-                  'data_updated' => (new DateTime('@'.$epoch))->format(DateTime::RFC3339),
-                  'software_version' => CONST_NominatimVersion
-                 );
-    $sDatabaseVersion = $oStatus->databaseVersion();
-    if ($sDatabaseVersion) {
-        $aResponse['database_version'] = $sDatabaseVersion;
-    }
-    javascript_renderData($aResponse);
-} else {
-    echo 'OK';
-}
-
-exit;