From 6e9c5c21676d23ceed7f6e143597c13445d5ff30 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 6 Jun 2013 14:33:55 +0000
Subject: [PATCH] make city state zip unreq

---
 Toolkit/Members/EditMemberInfo.php | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Toolkit/Members/EditMemberInfo.php b/Toolkit/Members/EditMemberInfo.php
index 3587350..e001c4c 100644
--- a/Toolkit/Members/EditMemberInfo.php
+++ b/Toolkit/Members/EditMemberInfo.php
@@ -1056,7 +1056,7 @@ class Toolkit_Members_EditMemberInfo
         if ($useCtrlCities) {
             $e[] = array(
                 'type'    => 'select',
-                'req'     => true,
+                'req'     => false,
                 'name'    => 'city_id',
                 'display' => 'City',
                 'opts'    => array('' => '-- Select --') + $this->cities
@@ -1064,7 +1064,7 @@ class Toolkit_Members_EditMemberInfo
         } else {
             $e[] = array(
                 'type'    => 'text',
-                'req'     => true,
+                'req'     => false,
                 'name'    => 'city',
                 'display' => 'City',
                 'opts'    => array('class' => 'text')
@@ -1072,7 +1072,7 @@ class Toolkit_Members_EditMemberInfo
         }
 		$e[] = array(
 			'type'    => 'select',
-			'req'     => true,
+			'req'     => false,
 			'name'    => 'state_id',
 			'display' => 'State / Province',
 			'opts'    => array('' => '-- Select --') + $this->states
@@ -1095,7 +1095,7 @@ class Toolkit_Members_EditMemberInfo
 		}
 		$e[] = array(
 			'type'    => 'text',
-			'req'     => true,
+			'req'     => false,
 			'name'    => 'zip',
 			'display' => 'Zip / Postal Code',
 			'opts'    => array('class' => 'text')
@@ -2048,6 +2048,14 @@ class Toolkit_Members_EditMemberInfo
             $this->dbh,
             $this->tableName
         );
+        $values['city_id'] 
+            = ($values['city_id'])
+            ? $values['city_id']
+            : null;
+        $values['state_id'] 
+            = ($values['state_id'])
+            ? $values['state_id']
+            : null;
 
 		foreach ($values as $k => $v) {
 			switch ($k) {
-- 
2.17.1