From 82772414387ac46f2e8fbc80d4f9e81f71d643f2 Mon Sep 17 00:00:00 2001 From: alvaro <alvaro@alia.(none)> Date: Tue, 23 Oct 2012 15:12:45 -0700 Subject: [PATCH] Removing JSON_NUMERIC_CHECK since it conflicts with PHP < 5.3.3 --- lib/Haanga/lib/Haanga/Extension/Filter/D3circlepacking.php | 2 +- lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/D3circlepacking.php b/lib/Haanga/lib/Haanga/Extension/Filter/D3circlepacking.php index 030dafed..2cfb60bf 100644 --- a/lib/Haanga/lib/Haanga/Extension/Filter/D3circlepacking.php +++ b/lib/Haanga/lib/Haanga/Extension/Filter/D3circlepacking.php @@ -130,7 +130,7 @@ var vis = d3.select("#clusterpacking'.$randId.'").append("svg") } -var jsonD3'.$randId.' = '.json_encode($json, JSON_NUMERIC_CHECK).'; +var jsonD3'.$randId.' = '.json_encode($json).'; initD3CirclePacking'.$randId.'(jsonD3'.$randId.') </script>'; return $pre.$post; diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php b/lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php index 887f2448..67d7158b 100644 --- a/lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php +++ b/lib/Haanga/lib/Haanga/Extension/Filter/Googlemaps.php @@ -61,7 +61,7 @@ class Haanga_Extension_Filter_Googlemaps{ var latSpan = southWest.lat() + northEast.lat(); var locations = ".json_encode($points)."; - var mapOptions$randId = ".json_encode($options, JSON_NUMERIC_CHECK)."; + var mapOptions$randId = ".json_encode($options)."; mapOptions$randId.mapTypeId= google.maps.MapTypeId.ROADMAP; var map = new google.maps.Map(document.getElementById('map_canvas'),mapOptions$randId); -- GitLab