Fix double encoding in Scheduled report edit page

plugins/Goals/Goals.php

@@ -194,6 +194,7 @@ class Goals extends \Piwik\Plugin
                 // Add the general Goal metrics: ie. total Goal conversions,
                 // Goal conv rate or Goal total revenue.
                 // This API call requires a custom parameter
+                $goal['name'] = Common::sanitizeInputValue($goal['name']);
                 $reports[] = array(
                     'category'         => $goalsCategory,
                     'name'             => Piwik::translate('Goals_GoalX', $goal['name']),

plugins/ScheduledReports/templates/_addReport.twig

@@ -130,7 +130,7 @@
                                             <input type='{{ reportInputType }}' id="{{ reportType }}{{ report.uniqueId }}" report-unique-id='{{ report.uniqueId }}'
                                                    name='{{ reportType }}Reports'/>
                                             <label for="{{ reportType }}{{ report.uniqueId }}">
-                                                {{ report.name }}
+                                                {{ report.name|raw }}
                                                 {% if report.uniqueId=='MultiSites_getAll' %}
                                                     <div class="entityInlineHelp">{{ 'ScheduledReports_ReportIncludeNWebsites'|translate('"'~countWebsites~' "')
                                                         }}</div>