Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index df65848d91f47cd36fbec805ae211611d4c8c4a4..48fba5accf7d8d284990af76786db80ecc0ec880 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -178,7 +178,7 @@
        {
                $aResult = array(array(join(' ',$aWords)));
                $sFirstToken = '';
        {
                $aResult = array(array(join(' ',$aWords)));
                $sFirstToken = '';

-               if ($iDepth < 8) {
+               if ($iDepth < 7) {

                        while(sizeof($aWords) > 1)
                        {
                                $sWord = array_shift($aWords);
                        while(sizeof($aWords) > 1)
                        {
                                $sWord = array_shift($aWords);


@@ -671,7 +671,10 @@
        function javascript_renderData($xVal)
        {
                header("Access-Control-Allow-Origin: *");
        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']))
                {
 
                if( ! isset($_GET['json_callback']))
                {