Refs #1652 Encoding the JS output for making map work in languages with single...

Refs #1652 Encoding the JS output for making map work in languages with single quotes in strings, eg. French

plugins/UserCountryMap/Controller.php

@@ -54,7 +54,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
 		$view->defaultMetric = 'nb_visits';
 
 		// some translations
-		$view->localeJSON = json_encode(array(
+		$view->localeJSON = Piwik_Common::json_encode(array(
 			'nb_visits' => Piwik_Translate('VisitsSummary_NbVisits'),
 			'one_visit' => Piwik_Translate('General_OneVisit'),
 			'no_visit' => Piwik_Translate('UserCountryMap_NoVisit'),
@@ -67,7 +67,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
 		));
 
 		// template for ajax requests
-		$view->reqParamsJSON = json_encode(array(
+		$view->reqParamsJSON = Piwik_Common::json_encode(array(
 			'period' => $period,
 			'idSite' => $idSite,
 			'date' => $date,
@@ -81,7 +81,7 @@ class Piwik_UserCountryMap_Controller extends Piwik_Controller
 		$view->metrics = $config['metrics'] = $this->getMetrics($idSite, $period, $date, $token_auth);
 		$config['svgBasePath'] = 'plugins/UserCountryMap/svg/';
 		$config['mapCssPath'] = 'plugins/UserCountryMap/css/map.css';
-		$view->config = json_encode($config);
+		$view->config = Piwik_Common::json_encode($config);
 		$view->noData = $config['visitsSummary']['nb_visits'] === 0;
 
 		echo $view->render();

plugins/UserCountryMap/templates/realtime-map.tpl

@@ -45,8 +45,8 @@
     config.svgBasePath = "{$piwikUrl}plugins/UserCountryMap/svg/";
     config.liveRefreshAfterMs = {$liveRefreshAfterMs};
 
-    config._ = JSON.parse('{$localeJSON}');
-    config.reqParams = JSON.parse('{$reqParamsJSON}');
+    config._ = JSON.parse('{$localeJSON|escape:'javascript'}');
+    config.reqParams = JSON.parse('{$reqParamsJSON|escape:'javascript'}');
     config.siteHasGoals = {$hasGoals};
     config.maxVisits = {$maxVisits};
 

plugins/UserCountryMap/templates/visitor-map.tpl

@@ -71,9 +71,9 @@
 <script type="text/javascript">
 
     var visitorMap,
-        config = JSON.parse('{$config}');
-    config._ = JSON.parse('{$localeJSON}');
-    config.reqParams = JSON.parse('{$reqParamsJSON}');
+        config = JSON.parse('{$config|escape:'javascript'}');
+    config._ = JSON.parse('{$localeJSON|escape:'javascript'}');
+    config.reqParams = JSON.parse('{$reqParamsJSON|escape:'javascript'}');
 
     $('.UserCountryMap').addClass('dataTable');