fix google map location data escape (#156)

dachcom-digital · Jun 4, 2021 · 5ac9242 · 5ac9242
1 parent 2b4db77
commit 5ac9242
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/UPGRADE.md b/UPGRADE.md
@@ -9,7 +9,8 @@ Just click the "update" button or execute the migration command to finish the bu
 #### Update from Version 3.2.5 to Version 3.3.0
 - **[NEW FEATURE]**: Pimcore 6.9.0 ready
 - **[IMPROVEMENT]**: use no-cookie domain for youtube videos [@ghettopro](https://github.com/dachcom-digital/pimcore-toolbox/pull/153)
-- **[BUG FIX]**: Fix invalid asset video markup[@gpalmisano](https://github.com/dachcom-digital/pimcore-toolbox/pull/154)
+- **[BUG FIX]**: Fix invalid asset video markup [@gpalmisano](https://github.com/dachcom-digital/pimcore-toolbox/pull/154)
+- **[BUG FIX]**: Fix google maps locations with single quotes [#151](https://github.com/dachcom-digital/pimcore-toolbox/issues/151)
 
 #### Update from Version 3.2.4 to Version 3.2.5
 - **[BUG FIX]**: Fix column adjuster column_store availability check

diff --git a/src/ToolboxBundle/Model/Document/Tag/GoogleMap.php b/src/ToolboxBundle/Model/Document/Tag/GoogleMap.php
@@ -58,7 +58,7 @@ public function frontend()
         $configData = property_exists($this, 'config') ? $this->config : $this->options;
 
         $dataAttr = [];
-        $dataAttr['data-locations'] = json_encode($this->data);
+        $dataAttr['data-locations'] = json_encode($this->data, JSON_HEX_QUOT | JSON_HEX_APOS);
         $dataAttr['data-show-info-window-on-load'] = $configData['iwOnInit'];
 
         $dataAttr['data-mapoption-zoom'] = $configData['mapZoom'];