From 3a67f7c655e48e5da12d6d1af8b0db56ee5a9891 Mon Sep 17 00:00:00 2001
From: Champ Camba <heychampsupertramp@gmail.com>
Date: Fri, 17 Feb 2017 18:46:20 +0800
Subject: [PATCH] Remove notices

---
 core/um-fields.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/um-fields.php b/core/um-fields.php
index d0b74f72..34e5458d 100644
--- a/core/um-fields.php
+++ b/core/um-fields.php
@@ -1794,7 +1794,7 @@ class UM_Fields {
 						$output .= $this->field_label($label, $key, $data);
 						}
 
-						$output .= '<div class="um-field-area '.( $this->field_icons == 'field' ? 'um-field-area-has-icon':'' ).' ">';
+						$output .= '<div class="um-field-area '.( isset(  $this->field_icons ) && $this->field_icons == 'field' ? 'um-field-area-has-icon':'' ).' ">';
 						if ( isset( $icon ) && $icon && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
 							$output .= '<div class="um-field-icon"><i class="'.$icon.'"></i></div>';
 						}
@@ -1956,7 +1956,7 @@ class UM_Fields {
 
 						$use_keyword = apply_filters('um_multiselect_option_value', 0, $data['type'] );
 
-						$output .= '<div class="um-field-area '.( $this->field_icons == 'field' ? 'um-field-area-has-icon':'' ).' ">';
+						$output .= '<div class="um-field-area '.( isset(  $this->field_icons ) && $this->field_icons == 'field' ? 'um-field-area-has-icon':'' ).' ">';
 						if ( isset( $icon ) && $icon && isset( $this->field_icons ) && $this->field_icons == 'field' ) {
 							$output .= '<div class="um-field-icon"><i class="'.$icon.'"></i></div>';
 						}
@@ -2534,7 +2534,10 @@ class UM_Fields {
 				$output .= '<div class="um-field' . $classes . '"' . $conditional . ' data-key="'.$key.'">';
 					
 						if ( isset( $data['label'] ) || isset( $data['icon'] ) && ! empty( $data['icon'] ) ) {
-							$output .= $this->field_label($label, $key, $data);
+
+							if( ! isset( $data['label'] ) ) $data['label'] = '';
+
+							$output .= $this->field_label( $data['label'], $key, $data);
 						}
 						
 						$res = $this->field_value( $key, $default, $data );