hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-11 13:24:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove PHP version check

Browse Source 
5.4 is the minimum supported version now.
This commit is contained in:
Sarah Hoffmann
2017-06-01 19:42:28 +02:00
parent bdd90e890b
commit d88c484fa1
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/lib.php
View File

@@ -475,16 +475,14 @@ function getResultDiameter($aResult)
function javascript_renderData($xVal, $iOptions = 0) function javascript_renderData($xVal, $iOptions = 0)
{ {
if (defined('PHP_VERSION_ID') && PHP_VERSION_ID > 50400) { $iOptions |= JSON_UNESCAPED_UNICODE;
$iOptions |= JSON_UNESCAPED_UNICODE; if (isset($_GET['pretty']) && in_array(strtolower($_GET['pretty']), array('1', 'true'))) {
if (isset($_GET['pretty']) && in_array(strtolower($_GET['pretty']), array('1', 'true'))) { $iOptions |= JSON_PRETTY_PRINT;
$iOptions |= JSON_PRETTY_PRINT;
}
} }
$jsonout = json_encode($xVal, $iOptions); $jsonout = json_encode($xVal, $iOptions);
if (! isset($_GET['json_callback'])) { if (!isset($_GET['json_callback'])) {
header("Content-Type: application/json; charset=UTF-8"); header("Content-Type: application/json; charset=UTF-8");
echo $jsonout; echo $jsonout;
} else { } else {