Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 37ef5e190ba2d405447abe736cc1cc3feac12daf..3a6166a60e022d3921ce54db8d48d051b8cbade4 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -68,7 +68,7 @@ function javascript_renderData($xVal, $iOptions = 0)
         throw new Exception('Invalid json_callback value', 400);
     }
 
-    $iOptions |= JSON_UNESCAPED_UNICODE;
+    $iOptions |= JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES;
     if (isset($_GET['pretty']) && in_array(strtolower($_GET['pretty']), array('1', 'true'))) {
         $iOptions |= JSON_PRETTY_PRINT;
     }