Prevent duplicate post format taxonomy queries (WordPress#66627)

Add an early return to gutenberg_add_format_query_vars_to_query_loop_block if the taxonomy query already includes post formats. Co-authored-by: carolinan <[email protected]> Co-authored-by: Mamaduka <[email protected]> Co-authored-by: david-binda <[email protected]>
carstingaxion · Nov 1, 2024 · 99d2275 · 99d2275
1 parent fbdc0f9
commit 99d2275
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/lib/compat/wordpress-6.7/blocks.php b/lib/compat/wordpress-6.7/blocks.php
@@ -59,6 +59,16 @@ function gutenberg_add_format_query_vars_to_query_loop_block( $query, $block ) {
 		return $query;
 	}
 
+	// Return early if the query already contains a post format. This is to avoid duplication if the
+	// WordPress core filter is already applied.
+	if ( ! empty( $query['tax_query'] ) ) {
+		foreach ( $query['tax_query'] as $taxquery ) {
+			if ( isset( $taxquery['taxonomy'] ) && 'post_format' === $taxquery['taxonomy'] ) {
+				return $query;
+			}
+		}
+	}
+
 	$formats = $block->context['query']['format'];
 	/*
 	 * Validate that the format is either `standard` or a supported post format.