Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index b8f8d8b0b07397f5e21199799a89f657c99ef4a1..48fba5accf7d8d284990af76786db80ecc0ec880 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -671,7 +671,10 @@
        function javascript_renderData($xVal)
        {
                header("Access-Control-Allow-Origin: *");
-               $jsonout = json_encode($xVal);
+               $iOptions = 0;
+               if (defined('PHP_VERSION_ID') && PHP_VERSION_ID > 50400)
+                       $iOptions = JSON_UNESCAPED_UNICODE;
+               $jsonout = json_encode($xVal, $iOptions);
 
                if( ! isset($_GET['json_callback']))
                {