make city state zip unreq

diff --git a/Toolkit/Members/EditMemberInfo.php b/Toolkit/Members/EditMemberInfo.php
index 3587350..e001c4c 100644 (file)
--- 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) {