From 026d37a2a704ff6d95589dc8b207bad8c6d57100 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 1 Oct 2019 10:36:17 -0400
Subject: [PATCH] Update to replace &amp; with &

For output in text fields and the map markers.
---
 views/admin/member/memberEdit.html                        | 2 +-
 views/admin/member/memberInfo/editProfileDescription.html | 2 +-
 views/front/members/list.html                             | 2 +-
 views/ui/f6/text.html                                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/views/admin/member/memberEdit.html b/views/admin/member/memberEdit.html
index b0b38afc..c352d829 100644
--- a/views/admin/member/memberEdit.html
+++ b/views/admin/member/memberEdit.html
@@ -33,7 +33,7 @@
               <div class="glm-row">
                   <h4 {if $member.fieldRequired.name}class="glm-required"{/if}>{$terms.term_member_cap} Name:</h4>
                   <td {if $member.fieldFail.name}class="glm-form-bad-input glm-form-bad-input-general"{/if}>
-                      <input type="text" name="name" value="{$member.fieldData.name|escape}" class="glm-form-text-input-medium">
+                      <input type="text" name="name" value="{$member.fieldData.name|escape|replace:"&amp;":"&"}" class="glm-form-text-input-medium">
                       {if $member.fieldFail.name}<p class="glm-error">{$member.fieldFail.name}</p>{/if}
                   </td>
               </div>
diff --git a/views/admin/member/memberInfo/editProfileDescription.html b/views/admin/member/memberInfo/editProfileDescription.html
index f165392b..65fd9294 100644
--- a/views/admin/member/memberInfo/editProfileDescription.html
+++ b/views/admin/member/memberInfo/editProfileDescription.html
@@ -3,7 +3,7 @@
                         <div class="glm-row">
                             <h4 {if $memberInfo.fieldRequired.short_descr}class="glm-required"{/if}>Short Description:</h4>
                             <div {if $memberInfo.fieldFail.short_descr}class="glm-form-bad-input" data-tabid="glm-member-info-descr"{/if}>
-                                <input type="text" name="short_descr" value="{$memberInfo.fieldData.short_descr|escape}" class="glm-form-text-input glm-char-count" data-msgArea="short-descr-msg"
+                                <input type="text" name="short_descr" value="{$memberInfo.fieldData.short_descr|escape|replace:"&amp;":"&"}" class="glm-form-text-input glm-char-count" data-msgArea="short-descr-msg"
                                    maxlength="{if $settings.short_desc_char_limit}{$settings.short_desc_char_limit}{else}120{/if}" placeholder="A short, one line, description of the {$terms.term_member}."
                                    >
                                 <br><span id="short-descr-msg"></span>
diff --git a/views/front/members/list.html b/views/front/members/list.html
index 8d42cfe0..59515bbc 100755
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -576,7 +576,7 @@
                             {foreach $mapItems as $m}
                                 {if $m.lat != 0 && $m.lon != 0}
                                     // Create marker for this member and and to Feature Group
-                                    var leafletMarker = L.marker([{$m.lat}, {$m.lon}], { title:  '{$m.member_name|escape:quotes}' })
+                                    var leafletMarker = L.marker([{$m.lat}, {$m.lon}], { title:  '{$m.member_name|escape:quotes|replace:"&amp;":"&"}' })
                                         .bindPopup($('#map_info_' + {$m.id}).html(), {
                                             maxWidth: maxPopupWidth,
                                             maxHeight: maxPopupHeight
diff --git a/views/ui/f6/text.html b/views/ui/f6/text.html
index 2ec38b74..e6fbb230 100644
--- a/views/ui/f6/text.html
+++ b/views/ui/f6/text.html
@@ -46,7 +46,7 @@
                     type="{$ui.type|default:'text'}"
                     id="{$ui.field}"
                     name="{$ui.field}"
-                    value="{if empty($ui.value) && !empty($ui.default)}{$ui.default}{else}{$ui.value|escape}{/if}"
+                    value="{if empty($ui.value) && !empty($ui.default)}{$ui.default}{else}{$ui.value|escape|replace:"&amp;":"&"}{/if}"
                     {if !empty($ui.pattern)}pattern="{$ui.pattern}"{/if}
                     {if !empty($ui.required)}required{/if}
                     {if !empty($ui.placeholder)}placeholder="{$ui.placeholder}"{/if}
-- 
2.17.1