From 5140f3e2c0d7af41c1ab79db1d4cfa36e7c17c47 Mon Sep 17 00:00:00 2001
From: Chuck Scott <cscott@gaslightmedia.com>
Date: Thu, 22 Sep 2016 16:47:08 -0400
Subject: [PATCH] Fixed state not being selected correctly in pick list for
 member info locations.

---
 classes/data/dataMemberInfo.php                 | 2 +-
 views/admin/member/memberInfo/editLocation.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/classes/data/dataMemberInfo.php b/classes/data/dataMemberInfo.php
index b75b4155..08140c07 100644
--- a/classes/data/dataMemberInfo.php
+++ b/classes/data/dataMemberInfo.php
@@ -239,7 +239,7 @@ class GlmDataMemberInfo extends GlmDataAbstract
                 'field' => 'state',
                 'type' => 'list',
                 'list' => $this->config['states'],
-                'default' => 'MI',
+                'default'  => $this->config['settings']['default_state'],
                 'use' => 'a'
             ),
 
diff --git a/views/admin/member/memberInfo/editLocation.html b/views/admin/member/memberInfo/editLocation.html
index ff99a74b..d2938fc0 100644
--- a/views/admin/member/memberInfo/editLocation.html
+++ b/views/admin/member/memberInfo/editLocation.html
@@ -50,8 +50,8 @@
                 <td {if $memberInfo.fieldFail.state}class="glm-form-bad-input" data-tabid="glm-member-info-address"{/if}>
                     <select id="state" name="state">
         {foreach from=$memberInfo.fieldData.state.list item=v}
-                        <option value="{$v.value}"{if $settings.default_state == $v.value} selected="selected"{/if}>
-                            {$v.name} {if $settings.default_state == $v.value} (default){/if}
+                        <option value="{$v.value}"{if $memberInfo.fieldData.state.value == $v.value} selected="selected"{/if}>
+                            {$v.name}
                         </option>
         {/foreach}
                     </select>
-- 
2.17.1