From 9f8acc83773c7691f745fb41a928e0663977f563 Mon Sep 17 00:00:00 2001
From: champsupertramp <heychampsupertramp@gmail.com>
Date: Sun, 17 Jul 2016 11:22:09 +0800
Subject: [PATCH] Fix select fields with options pair

---
 core/um-actions-account.php | 8 ++++----
 core/um-fields.php          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/um-actions-account.php b/core/um-actions-account.php
index 6a2e999c..40c694bd 100644
--- a/core/um-actions-account.php
+++ b/core/um-actions-account.php
@@ -30,8 +30,8 @@
 				}
 			}
 		}
-
-		$changes = array();
+ 
+        $changes = array();
 		foreach( $_POST as $k => $v ) {
 			if ( !strstr( $k, 'password' ) && !strstr( $k, 'um_account' ) && in_array(  $k, $arr_fields ) ) {
 				$changes[ $k ] = $v;
@@ -42,8 +42,8 @@
 			delete_user_meta( um_user('ID'), 'hide_in_members' );
 			unset( $changes['hide_in_members'] );
 		}
-
-		// fired on account page, just before updating profile
+       
+       // fired on account page, just before updating profile
 		do_action('um_account_pre_update_profile', $changes, um_user('ID') );
 
 		$ultimatemember->user->update_profile( $changes );
diff --git a/core/um-fields.php b/core/um-fields.php
index a5a55248..d737a58e 100644
--- a/core/um-fields.php
+++ b/core/um-fields.php
@@ -1603,7 +1603,7 @@ class UM_Fields {
     
 							$output .= '<option value="' . $option_value . '" ';
 							
-							if ( $this->is_selected( $form_key, $option_value, $data ) ||  $this->is_selected( $form_key, $v, $data )  ) {
+							if ( $this->is_selected( $form_key, $option_value, $data ) ||  ( !  isset( $options_pair ) && $this->is_selected( $form_key, $v, $data ) ) ) {
 								$output.= 'selected';
 							}