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

use json_encode in search stuff as well

Browse Source 
remove JSON_UNESCAPED_UNICODE, supported only by php >=5.3.3 and
clients should be able to handle the escaping
This commit is contained in:
Sarah Hoffmann
2012-07-01 17:24:27 +02:00
parent 1cb55c6e31
commit e598e2ceed
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib.php
View File

@@ -597,7 +597,7 @@
{ {
header("Access-Control-Allow-Origin: *"); header("Access-Control-Allow-Origin: *");
$jsonout = json_encode($xVal, JSON_UNESCAPED_UNICODE); $jsonout = json_encode($xVal);
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");

2
lib/template/search-html.php
View File

@@ -358,7 +358,7 @@ target="_blank">FAQ</a></td>
echo ', '.$aResult['aBoundingBox'][1]; echo ', '.$aResult['aBoundingBox'][1];
echo ', '.$aResult['aBoundingBox'][2]; echo ', '.$aResult['aBoundingBox'][2];
echo ', '.$aResult['aBoundingBox'][3]; echo ', '.$aResult['aBoundingBox'][3];
if (isset($aResult['aPolyPoints'])) echo ', '.javascript_renderData($aResult['aPolyPoints']); if (isset($aResult['aPolyPoints'])) echo ', '.json_encode($aResult['aPolyPoints']);
echo ');\'>'; echo ');\'>';
} }
elseif (isset($aResult['zoom'])) elseif (isset($aResult['zoom']))

2
lib/template/search-xml.php
View File

@@ -45,7 +45,7 @@
if ($bShowPolygons && isset($aResult['aPolyPoints'])) if ($bShowPolygons && isset($aResult['aPolyPoints']))
{ {
echo ' polygonpoints=\''; echo ' polygonpoints=\'';
echo javascript_renderData($aResult['aPolyPoints']); echo json_encode($aResult['aPolyPoints']);
echo '\''; echo '\'';
} }
} }