From d88c484fa1073f483b373e88f57855358359b47e Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Thu, 1 Jun 2017 19:42:28 +0200 Subject: [PATCH] remove PHP version check 5.4 is the minimum supported version now. --- lib/lib.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/lib.php b/lib/lib.php index b622748c..9691f88a 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -475,16 +475,14 @@ function getResultDiameter($aResult) function javascript_renderData($xVal, $iOptions = 0) { - if (defined('PHP_VERSION_ID') && PHP_VERSION_ID > 50400) { - $iOptions |= JSON_UNESCAPED_UNICODE; - if (isset($_GET['pretty']) && in_array(strtolower($_GET['pretty']), array('1', 'true'))) { - $iOptions |= JSON_PRETTY_PRINT; - } + $iOptions |= JSON_UNESCAPED_UNICODE; + if (isset($_GET['pretty']) && in_array(strtolower($_GET['pretty']), array('1', 'true'))) { + $iOptions |= JSON_PRETTY_PRINT; } $jsonout = json_encode($xVal, $iOptions); - if (! isset($_GET['json_callback'])) { + if (!isset($_GET['json_callback'])) { header("Content-Type: application/json; charset=UTF-8"); echo $jsonout; } else { -- 2.39.5