Merge branch 'patch-1' of https://github.com/Firefishy/Nominatim

[nominatim.git] / lib / template / search-json.php

diff --git a/lib/template/search-json.php b/lib/template/search-json.php
index 7c695ea5bd51573d19285d2cd21f463ee0932076..4eed52ae122490f8f8d0abbf2bdb6c16d15d12a0 100644 (file)
--- a/lib/template/search-json.php
+++ b/lib/template/search-json.php
@@ -1,7 +1,4 @@
 <?php
-       header("Content-Type: application/json; charset=UTF-8");
-       header("Access-Control-Allow-Origin: *");
-
        $aFilteredPlaces = array();
        foreach($aSearchResults as $iResNum => $aPointDetails)
        {
@@ -55,11 +52,4 @@
                $aFilteredPlaces[] = $aPlace;
        }
 
-       if (isset($_GET['json_callback']) && preg_match('/^[-A-Za-z0-9:_.]+$/',$_GET['json_callback']))
-       {
-               echo $_GET['json_callback'].'('.javascript_renderData($aFilteredPlaces).')';
-       }
-       else
-       {
-               echo javascript_renderData($aFilteredPlaces);
-       }
+       javascript_renderData($aFilteredPlaces);