| Index: trunk/extensions/Maps/includes/services/GoogleMaps/Maps_GoogleMaps.php |
| — | — | @@ -214,9 +214,9 @@ |
| 215 | 215 | $dependencies[] = Html::linkedScript( "http://maps.google.com/maps?file=api&v=2&key=$egGoogleMapsKey&hl=$langCode" ); |
| 216 | 216 | |
| 217 | 217 | $dependencies[] = Html::inlineScript( |
| 218 | | - 'var googleMapsKey = '. json_encode( $egGoogleMapsKey ) . ';' . |
| 219 | | - 'var googleMapsKeys = '. json_encode( $egGoogleMapsKeys ) . ';' . |
| 220 | | - 'var googleLangCode = '. json_encode( $langCode ) . ';' |
| | 218 | + 'var googleMapsKey = '. FormatJson::encode( $egGoogleMapsKey ) . ';' . |
| | 219 | + 'var googleMapsKeys = '. FormatJson::encode( $egGoogleMapsKeys ) . ';' . |
| | 220 | + 'var googleLangCode = '. FormatJson::encode( $langCode ) . ';' |
| 221 | 221 | ); |
| 222 | 222 | |
| 223 | 223 | return $dependencies; |
| Index: trunk/extensions/Maps/includes/Maps_Mapper.php |
| — | — | @@ -172,7 +172,7 @@ |
| 173 | 173 | if ( !$baseInit ) { |
| 174 | 174 | $baseInit = true; |
| 175 | 175 | global $egMapsScriptPath; |
| 176 | | - $json .= 'var egMapsScriptPath =' . json_encode( $egMapsScriptPath ) . ';'; |
| | 176 | + $json .= 'var egMapsScriptPath =' . FormatJson::encode( $egMapsScriptPath ) . ';'; |
| 177 | 177 | $json .= 'var maps={};'; |
| 178 | 178 | } |
| 179 | 179 | |
| Index: trunk/extensions/Maps/includes/features/Maps_BasePointMap.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | |
| 95 | 95 | return Html::inlineScript( |
| 96 | 96 | MapsMapper::getBaseMapJSON( $this->service->getName() ) |
| 97 | | - . "maps.{$this->service->getName()}.{$mapName}=" . json_encode( $object ) . ';' |
| | 97 | + . "maps.{$this->service->getName()}.{$mapName}=" . FormatJson::encode( $object ) . ';' |
| 98 | 98 | ); |
| 99 | 99 | } |
| 100 | 100 | |
| Index: trunk/extensions/Maps/includes/features/Maps_BaseMap.php |
| — | — | @@ -117,7 +117,7 @@ |
| 118 | 118 | |
| 119 | 119 | return Html::inlineScript( |
| 120 | 120 | MapsMapper::getBaseMapJSON( $this->service->getName() ) |
| 121 | | - . "maps.{$this->service->getName()}.{$mapName}=" . json_encode( $object ) . ';' |
| | 121 | + . "maps.{$this->service->getName()}.{$mapName}=" . FormatJson::encode( $object ) . ';' |
| 122 | 122 | ); |
| 123 | 123 | } |
| 124 | 124 | |