From c84f645fc8bbcfd391d46647a0ba351b4820f44f Mon Sep 17 00:00:00 2001
From: champsupertramp <heychampsupertramp@gmail.com>
Date: Sun, 3 Jul 2016 22:02:58 +0800
Subject: [PATCH] Fix encoding non UTF8 strings

---
 core/um-fields.php         | 29 ++++++++++++++++++-----------
 core/um-filters-fields.php | 17 +++++++++++++++++
 2 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/core/um-fields.php b/core/um-fields.php
index 89b540aa..361d00e1 100644
--- a/core/um-fields.php
+++ b/core/um-fields.php
@@ -1596,9 +1596,8 @@ class UM_Fields {
 								$option_value = $k;
 							}
 							
-							$option_value = htmlentities($option_value);
-							$option_value = apply_filters('um_select_dropdown_dynamic_option_value', $option_value);
-
+							$option_value = apply_filters('um_field_non_utf8_value',$option_value );
+    
 							$output .= '<option value="' . $option_value . '" ';
 							
 							if ( $this->is_selected( $form_key, $option_value, $data ) ||  $this->is_selected( $form_key, $v, $data )  ) {
@@ -1660,9 +1659,9 @@ class UM_Fields {
 						$output .= '<option value=""></option>';
 
 						// add options
-						foreach($options as $k => $v) {
+						foreach( $options as $k => $v ) {
 
-							$v = rtrim($v);
+							$v = rtrim( $v );
 
 							$use_keyword = apply_filters('um_multiselect_option_value', 0, $data['type'] );
 
@@ -1672,11 +1671,13 @@ class UM_Fields {
 								$opt_value = $v;
 							}
 
-							$output .= '<option value="'.htmlentities($opt_value).'" ';
-							if ( $this->is_selected($key, $opt_value, $data) ) {
-								$output.= 'selected';
+							$opt_value = apply_filters('um_field_non_utf8_value',$opt_value );
+    
+							$output .= '<option value="'.$opt_value.'" ';
+							if ( $this->is_selected( $key, $opt_value, $data ) ) {
+								$output .= 'selected';
 							}
-							$output .= '>'.__($v,UM_TEXTDOMAIN).'</option>';
+							$output .= '>'.__( $v ,UM_TEXTDOMAIN).'</option>';
 
 						}
 
@@ -1685,7 +1686,7 @@ class UM_Fields {
 						$output .= '</div>';
 
 						if ( $this->is_error($key) ) {
-							$output .= $this->field_error( $this->show_error($key) );
+							$output .= $this->field_error( $this->show_error( $key ) );
 						}
 
 						$output .= '</div>';
@@ -1754,7 +1755,10 @@ class UM_Fields {
 							}
 
 							$output .= '<label class="um-field-radio '.$active.' um-field-half '.$col_class.'">';
-							$output .= '<input type="radio" name="'.$form_key.'" value="'.htmlentities($option_value).'" ';
+
+							$option_value = apply_filters('um_field_non_utf8_value',$option_value );
+    
+							$output .= '<input type="radio" name="'.$form_key.'" value="'.$option_value.'" ';
 
 							if ( $this->is_radio_checked($key, $option_value, $data) ) {
 								$output.= 'checked';
@@ -1821,6 +1825,9 @@ class UM_Fields {
 							}
 
 							$output .= '<label class="um-field-checkbox '.$active.' um-field-half '.$col_class.'">';
+
+							$v = apply_filters('um_field_non_utf8_value', $v );
+    
 							$output .= '<input type="checkbox" name="'.$key.'[]" value="'.strip_tags( $v ).'" ';
 
 							if ( $this->is_selected($key, $v, $data) ) {
diff --git a/core/um-filters-fields.php b/core/um-filters-fields.php
index 9b64eed5..d1f640c1 100644
--- a/core/um-filters-fields.php
+++ b/core/um-filters-fields.php
@@ -373,3 +373,20 @@
 
 		return $options;
 	}
+    
+
+    /**
+     * Filter non-UTF8 strings
+     * @param  string $value 
+     * @return string
+     * @uses hook filter: um_field_non_utf8_value
+     */
+    add_filter('um_field_non_utf8_value','um_field_non_utf8_value');
+    function um_field_non_utf8_value( $value ){
+    	
+    	if( ! preg_match('/[^\\p{Common}\\p{Latin}]/u', $value ) ){
+								$value = htmlentities( $value );
+		}
+
+		return $value;
+    }
\ No newline at end of file