Fix encoding

Author: nfourtythree

src/controllers/CatalogPricingRulesController.php

@@ -103,7 +103,7 @@ public function actionIndex(?string $storeHandle = null): Response
 
             $tableData[] = [
                 'id' => $pcr->id,
-                'title' => Html::encode(Craft::t('site', $pcr->name)),
+                'title' => Craft::t('site', $pcr->name),
                 'url' => $pcr->getCpEditUrl(),
                 'status' => $pcr->enabled ? true : false,
                 'duration' => $dateRange,

src/controllers/DiscountsController.php

@@ -275,7 +275,7 @@ public function actionTableData(): Response
 
             $tableData[] = [
                 'id' => $item['id'],
-                'title' => Html::encode(Craft::t('site', $item['name'])),
+                'title' => Craft::t('site', $item['name']),
                 'url' => UrlHelper::cpUrl('commerce/store-management/' . $store->handle . '/discounts/' . $item['id']),
                 'status' => (bool)$item['enabled'],
                 'duration' => $dateRange,

src/elements/Order.php

@@ -2725,7 +2725,8 @@ public function getCustomerLinkHtml(): string
     {
         $html = '';
         if ($user = $this->getCustomer()) {
-            $html = Html::tag('a', $user->email, ['href' => $user->getCpEditUrl()]);
+            $email = Html::encode($user->email);
+            $html = Html::tag('a', $email, ['href' => $user->getCpEditUrl()]);
         }
 
         return $html;

src/templates/settings/emails/index.twig

@@ -46,7 +46,7 @@
     {% for email in storeEmails %}
         {% set tableData = tableData|merge([{
             id: email.id,
-            title: email.name|t('site')|e,
+            title: email.name|t('site'),
             status: email.enabled ? true : false,
             url: email.getCpEditUrl(),
             subject: email.subject|t('site')|e,
@@ -66,7 +66,7 @@
             { name: 'template', title: Craft.t('commerce', 'Template Path'),
                 callback: function(value) {
                     if (value) {
-                        return '<span class="code">'+Craft.escapeHtml(value)+'</span>';
+                        return '<span class="code">'+value+'</span>';
                     }
 
                     return '';

src/templates/settings/gateways/index.twig

@@ -53,9 +53,9 @@
     {% for gateway in gateways %}
         {% set tableData = tableData|merge([{
             id: gateway.id,
-            title: gateway.name|t('site')|e,
+            title: gateway.name|t('site'),
             url: gateway.getCpEditUrl(),
-            handle: gateway.handle|e,
+            handle: gateway.handle,
             type: {
                 missing: gateway is missing ? true : false,
                 name: (gateway is missing? gateway.expectedType : gateway.displayName())|e

src/templates/settings/pdfs/index.twig

@@ -50,8 +50,8 @@
     {% for pdf in storePdfs %}
         {% set tableData = tableData|merge([{
             id: pdf.id,
-            title: pdf.name|t('site')|e,
-            handle: pdf.handle|e,
+            title: pdf.name|t('site'),
+            handle: pdf.handle,
             status: pdf.enabled ? true : false,
             url:pdf.getCpEditUrl(),
             isDefault: pdf.isDefault ? true : false,