fixed: keep special characters intact in downloads

ColdTrick · Nov 9, 2020 · 008df96 · 008df96
1 parent b16c23b
commit 008df96
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/actions/event_manager/attendees/export.php b/actions/event_manager/attendees/export.php
@@ -46,7 +46,11 @@
 fputcsv($fh, array_keys($rows[0]), ';');
 
 foreach ($rows as $row) {
-	fputcsv($fh, array_values($row), ';');
+	$decoded_rows = array_map(function($row) {
+		return html_entity_decode($row);
+	}, array_values($row));
+
+	fputcsv($fh, $decoded_rows, ';');
 }
 
 $contents = '';

diff --git a/views/default/event_manager/event/addthisevent.php b/views/default/event_manager/event/addthisevent.php
@@ -10,7 +10,7 @@
 $start = $event->getStartDate('d/m/Y H:i:00');
 $end = $event->getEndDate('d/m/Y H:i:00');
 
-$title = $event->getDisplayName();
+$title = html_entity_decode($event->getDisplayName());
 
 $description = '';
 if (!empty($event->location)) {

diff --git a/views/default/js/addthisevent.js b/views/default/js/addthisevent.js
@@ -86,7 +86,7 @@ var addthisevent = function() {
                         }
                         if (addthisevent.hasclass(g[m], '_summary') || addthisevent.hasclass(g[m], 'summary') || addthisevent.hasclass(g[m], 'title')) {
                             g[m].style.display = 'none';
-                            f += '&dsum=' + encodeURIComponent(addthisevent.htmlencode(g[m].innerHTML))
+                            f += '&dsum=' + encodeURIComponent(g[m].innerHTML)
                         }
                         if (addthisevent.hasclass(g[m], '_description') || addthisevent.hasclass(g[m], 'description')) {
                             g[m].style.display = 'none';