safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests 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

2
lib/lib.php
View File

@@ -475,12 +475,10 @@ 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);