From 9be88e17c91531b2054a2db6382fd984ac48abb6 Mon Sep 17 00:00:00 2001
From: champsupertramp <heychampsupertramp@gmail.com>
Date: Wed, 10 Aug 2016 17:19:12 +0800
Subject: [PATCH] Fix fields conditional logic

---
 core/um-short-functions.php | 52 +++++++++++++++++++++++++++++++++----
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/core/um-short-functions.php b/core/um-short-functions.php
index 8eb9a74f..9cb570f3 100644
--- a/core/um-short-functions.php
+++ b/core/um-short-functions.php
@@ -276,10 +276,32 @@ function um_user_ip() {
 				$val = $arr[3];
 				$op = $arr[2];
 				$field = um_profile($arr[1]);
-
+				
 				switch( $op ) {
-					case 'equals to': if ( $field != $val ) $state = 0; break;
-					case 'not equals': if ( $field == $val ) $state = 0; break;
+					case 'equals to': 
+
+						if( is_serialized( $field ) ){
+							if ( ! in_array( $val , unserialize( $field ) ) ) {
+								$state = 0; 
+							}
+						}else{
+							if ( $field != $val ) {
+								$state = 0; 
+							}
+						}
+						
+					break;
+					case 'not equals': 
+						if( is_serialized( $field ) ){
+							if ( in_array( $val , unserialize( $field ) ) ) {
+								$state = 0; 
+							}
+						}else{
+							if ( $field == $val ) {
+								$state = 0; 
+							}
+						}
+					break;
 					case 'empty': if ( $field ) $state = 0; break;
 					case 'not empty': if ( !$field ) $state = 0; break;
 					case 'greater than': if ( $field <= $val ) $state = 0; break;
@@ -296,8 +318,28 @@ function um_user_ip() {
 				$field = um_profile($arr[1]);
 
 				switch( $op ) {
-					case 'equals to': if ( $field != $val ) $state = 1; break;
-					case 'not equals': if ( $field == $val ) $state = 1; break;
+					case 'equals to': 
+						if( is_serialized( $field ) ){
+							if ( ! in_array( $val , unserialize( $field ) ) ) {
+								$state = 1; 
+							}
+						}else{
+							if ( $field != $val ) {
+								$state = 1; 
+							}
+						}
+					break;
+					case 'not equals': 
+						if( is_serialized( $field ) ){
+							if ( in_array( $val , unserialize( $field ) ) ) {
+								$state = 1; 
+							}
+						}else{
+							if ( $field == $val ) {
+								$state = 1; 
+							}
+						}
+					break;
 					case 'empty': if ( $field ) $state = 1; break;
 					case 'not empty': if ( !$field ) $state = 1; break;
 					case 'greater than': if ( $field <= $val ) $state = 1; break;