From 253e0b48193142a57a4c20e95d39784983ee752a Mon Sep 17 00:00:00 2001
From: Ultimate Member <umplugin@gmail.com>
Date: Sat, 12 Dec 2015 21:07:39 +0200
Subject: [PATCH] Compatibility with upcoming User Tags extension

---
 core/um-fields.php | 4 +++-
 um-init.php        | 6 +++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/core/um-fields.php b/core/um-fields.php
index 4b91e127..069f6809 100644
--- a/core/um-fields.php
+++ b/core/um-fields.php
@@ -1559,7 +1559,9 @@ class UM_Fields {
 						
 							$v = rtrim($v);
 							
-							if ( is_string( $k ) ) {
+							$use_keyword = apply_filters('um_multiselect_option_value', 0, $data['type'] );
+							
+							if ( $use_keyword ) {
 								$opt_value = $k;
 							} else {
 								$opt_value = $v;
diff --git a/um-init.php b/um-init.php
index c5ba1b24..598ba2e3 100644
--- a/um-init.php
+++ b/um-init.php
@@ -15,6 +15,7 @@ class UM_API {
 		}
 
 		add_action('init',  array(&$this, 'init'), 0);
+		add_action('init',  array(&$this, 'form'), 10);
 		
 		add_action('init',  array(&$this, 'load_addons') );
 
@@ -158,7 +159,6 @@ class UM_API {
 		$this->datetime = new UM_DateTime();
 		$this->chart = new UM_Chart();
 		$this->builtin = new UM_Builtin();
-		$this->form = new UM_Form();
 		$this->files = new UM_Files();
 		$this->taxonomies = new UM_Taxonomies();
 		$this->validation = new UM_Validation();
@@ -186,6 +186,10 @@ class UM_API {
 
 	}
 	
+	function form() {
+		$this->form = new UM_Form();
+	}
+	
 }
 
 $ultimatemember = new UM_API();
\ No newline at end of file