Merge pull request #530 from takayukister/dev/5.5

Use wpcf7_canonicalize()
rocklobster-in · Aug 28, 2021 · 56bae20 · 56bae20
2 parents 3511257 + 59c9c95
commit 56bae20
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 20 deletions.
diff --git a/includes/pipe.php b/includes/pipe.php
@@ -35,20 +35,22 @@ private function add_pipe( $text ) {
 	}
 
 	public function do_pipe( $input ) {
+		$input_canonical = wpcf7_canonicalize( $input, array(
+			'strto' => 'as-is',
+		) );
+
 		foreach ( $this->pipes as $pipe ) {
-			$before = html_entity_decode(
-				$pipe->before,
-				ENT_QUOTES | ENT_HTML5,
-				'UTF-8'
-			);
 
-			$after = html_entity_decode(
-				$pipe->after,
-				ENT_QUOTES | ENT_HTML5,
-				'UTF-8'
+			list( $before, $after ) = array_map(
+				function ( $item ) {
+					return wpcf7_canonicalize( $item, array(
+						'strto' => 'as-is',
+					) );
+				},
+				array( $pipe->before, $pipe->after )
 			);
 
-			if ( $before === $input ) {
+			if ( $input_canonical === $before ) {
 				return $after;
 			}
 		}

diff --git a/includes/submission.php b/includes/submission.php
@@ -327,16 +327,13 @@ private function setup_posted_data() {
 						-1, 1
 					);
 
-					$last_val = html_entity_decode(
-						$last_val,
-						ENT_QUOTES | ENT_HTML5,
-						'UTF-8'
-					);
-
-					$tied_item = html_entity_decode(
-						$tied_item,
-						ENT_QUOTES | ENT_HTML5,
-						'UTF-8'
+					list( $last_val, $tied_item ) = array_map(
+						function ( $item ) {
+							return wpcf7_canonicalize( $item, array(
+								'strto' => 'as-is',
+							) );
+						},
+						array( $last_val, $tied_item )
 					);
 
 					if ( $last_val === $tied_item ) {