Merge b4100fe into 40da397

Author: Crabcyborg

classes/models/FrmEntryValidate.php

@@ -265,6 +265,11 @@ private static function option_is_valid( $field, $value, $options ) {
 					break;
 				}
 
+				$match = self::is_filtered_match( $current_value, $option_value );
+				if ( $match ) {
+					break;
+				}
+
 				if ( is_numeric( $current_value ) ) {
 					$match = (int) $current_value === (int) $option_value;
 					if ( $match ) {
@@ -281,6 +286,30 @@ private static function option_is_valid( $field, $value, $options ) {
 		return true;
 	}
 
+	/**
+	 * Make an extra check after passing $option_value through the_content filter.
+	 * This is to help catch cases where the option's formatting has been modified using
+	 * the_content filter.
+	 *
+	 * @since x.x
+	 *
+	 * @param string $value
+	 * @param string $option_value
+	 * @return bool
+	 */
+	private static function is_filtered_match( $value, $option_value ) {
+		// First remove the wpautop filter so it doesn't add extra tags to $option_value.
+		$filter_priority = has_filter( 'the_content', 'wpautop' );
+		if ( is_numeric( $filter_priority ) ) {
+			remove_filter( 'the_content', 'wpautop', $filter_priority );
+		}
+		$filtered_option = apply_filters( 'the_content', $option_value );
+		if ( is_numeric( $filter_priority ) ) {
+			add_filter( 'the_content', 'wpautop', $filter_priority );
+		}
+		return $value === trim( $filtered_option );
+	}
+
 	/**
 	 * Do not validate options if they have been modified with a hook.
 	 * This is to help avoid issues where the options could be based on a URL param for example.