Merge branch 'main' of https://github.com/pfefferle/wordpress-webmention

pfefferle · pfefferle · commit c64391bbe523 · 2024-07-16T08:58:38.000+02:00
diff --git a/includes/Handler/class-mf2.php b/includes/Handler/class-mf2.php
@@ -589,6 +589,14 @@ public function compare_urls( $needle, $haystack, $schemeless = true ) {
 			$needle = array( $needle );
 		}
 
+		// Flatten the haystack to ensure it only contains strings
+		$haystack = array_filter(
+			$haystack,
+			function ( $element ) {
+				return is_string( $element ) && ! is_array( $element );
+			}
+		);
+
 		// Compare both arrays.
 		return array_intersect( $needle, $haystack );
 	}

Original file line number	Diff line number	Diff line change
`@@ -589,6 +589,14 @@ public function compare_urls( $needle, $haystack, $schemeless = true ) {`
`589`	`589`	`$needle = array( $needle );`
`590`	`590`	`}`
`591`	`591`
	`592`	`+ // Flatten the haystack to ensure it only contains strings`
	`593`	`+ $haystack = array_filter(`
	`594`	`+ $haystack,`
	`595`	`+ function ( $element ) {`
	`596`	`+ return is_string( $element ) && ! is_array( $element );`
	`597`	`+ }`
	`598`	`+ );`
	`599`	`+`
`592`	`600`	`// Compare both arrays.`
`593`	`601`	`return array_intersect( $needle, $haystack );`
`594`	`602`	`}`