From 3e1231230ab2bc85205ac3c1eebc826dc49e343f Mon Sep 17 00:00:00 2001
From: champsupertramp <heychampsupertramp@gmail.com>
Date: Mon, 12 Sep 2016 19:51:49 +0800
Subject: [PATCH] Fix assigning of roles on registration process

---
 core/um-form.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/core/um-form.php b/core/um-form.php
index e7eae33f..303d9b11 100644
--- a/core/um-form.php
+++ b/core/um-form.php
@@ -136,7 +136,7 @@ class UM_Form {
 					$this->post_form['role'] = $role;
 					$this->post_form['submitted']['role'] = $role;
 				}
-                
+				
                
 				if ( isset( $_POST[ $ultimatemember->honeypot ] ) && $_POST[ $ultimatemember->honeypot ] != '' ){
 					wp_die('Hello, spam bot!');
@@ -227,19 +227,19 @@ class UM_Form {
 	function assigned_role( $post_id ){
 
 		$mode = $this->form_type( $post_id );
-		$use_globals = get_post_meta( $post_id, "_um_{mode}_use_globals", true);
+		$use_globals = get_post_meta( $post_id, "_um_{$mode}_use_globals", true);
        
         $global_role = um_get_option('default_role'); // Form Global settings
 
 		if( $use_globals == 0 ){ // Non-Global settings
-			$role = get_post_meta( $post_id, "_um_{mode}_role", true );
+			$role = get_post_meta( $post_id, "_um_{$mode}_role", true );
 		}
 
-		if( ! $role || $role == 0 ){ // custom role is default, return default role's slug
+		if( empty( $role ) ){ // custom role is default, return default role's slug
 			$role = $global_role;
 		}
-
-		return $role;
+        
+    	return $role;
 	
 	}