From: Steve Sutton <steve@gaslightmedia.com>
Date: Tue, 3 Jul 2018 12:40:32 +0000 (-0400)
Subject: Correcting the city for the changes in the data class.
X-Git-Tag: v1.1.12^2~20
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/index.cgi?a=commitdiff_plain;h=f4d6c415984f24f4cbc665c9f823c4508ac4f643;p=WP-Plugins%2Fglm-member-db-contacts.git

Correcting the city for the changes in the data class.

Since the force_list is turned off the city is now just a string.
---

diff --git a/views/admin/ajax/contactsListExport.html b/views/admin/ajax/contactsListExport.html
index ffbd14f..69d4072 100644
--- a/views/admin/ajax/contactsListExport.html
+++ b/views/admin/ajax/contactsListExport.html
@@ -43,7 +43,7 @@
                     {if $select.exportLname}<td>{$m.lname}</td>{/if}
                     {if $select.exportAddr1}<td>{$m.addr1}</td>{/if}
                     {if $select.exportAddr2}<td>{$m.addr2}</td>{/if}
-                    {if $select.exportCity}<td>{if $m.city}{$m.city.name}{/if}</td>{/if}
+                    {if $select.exportCity}<td>{$m.city}</td>{/if}
                     {if $select.exportCounty}<td>{$m.county}</td>{/if}
                     {if $select.exportState}<td>{if $m.state}{$m.state.value}{/if}</td>{/if}
                     {if $select.exportZip}<td>{$m.zip}</td>{/if}
diff --git a/views/admin/ajax/contactsListExportCsv.html b/views/admin/ajax/contactsListExportCsv.html
index c45eba3..b6cf197 100644
--- a/views/admin/ajax/contactsListExportCsv.html
+++ b/views/admin/ajax/contactsListExportCsv.html
@@ -27,7 +27,7 @@
 {if $select.exportLname}"{$m.lname}",{/if}
 {if $select.exportAddr1}"{$m.addr1}",{/if}
 {if $select.exportAddr2}"{$m.addr2}",{/if}
-{if $select.exportCity}"{if $m.city}{$m.city.name}{/if}",{/if}
+{if $select.exportCity}"{$m.city}",{/if}
 {if $select.exportCounty}"{$m.county}",{/if}
 {if $select.exportState}"{if $m.state}{$m.state.value}{/if}",{/if}
 {if $select.exportZip}"{$m.zip}",{/if}