Changeset 13332

Timestamp:

09/30/2022 08:04:47 PM (3 years ago)

Author:

imath

Message:

Avoid querying for comments when viewing a BuddyPress page in TT3

The Twenty Twenty-Three block theme is using the core/comments block to
display comments for WP Pages or Posts. After checking if comments are
open, this block is doing an additional comment count query which wrongly
returns the site's all comment count as BuddyPress pages ID is reset to
0.

In this case forcing comments to be closed is not enough, we also need to
force the comment count to be 0.

See #8744 (trunk)

--Cette ligne, et les suivantes
ci-dessous, seront ignorées--

M src/bp-core/bp-core-filters.php
M src/bp-core/bp-core-theme-compatibility.php

Location:

trunk/src/bp-core

Files:

• bp-core-filters.php (modified) (1 diff)
• bp-core-theme-compatibility.php (modified) (1 diff)

trunk/src/bp-core/bp-core-filters.php

@@ -78 +78 @@
 // Turn comments off for BuddyPress pages.
 add_filter( 'comments_open', 'bp_comments_open', 10, 2 );
+
+// Force comments count to be 0 or comments list to be an empty array.
+add_filter( 'comments_pre_query', 'bp_comments_pre_query', 10, 2 );
 
 // Prevent DB query for WP's main loop.

trunk/src/bp-core/bp-core-theme-compatibility.php

@@ -937 +937 @@
 
 /**
+ * Avoid potential extra comment query on BuddyPress pages.
+ *
+ * @since 10.5.0
+ *
+ * @param array|int|null   $comment_data     The comments list, the comment count or null.
+ * @param WP_Comment_Query $wp_comment_query The WP_Comment_Query instance.
+ * @return array|int|null Null to leave WordPress deal with the comment query, an empty array or 0 to shortcircuit it.
+ */
+function bp_comments_pre_query( $comment_data, $wp_comment_query ) {
+    $is_post_null = isset( $wp_comment_query->query_vars['post_id'] ) && 0 === (int) $wp_comment_query->query_vars['post_id'];
+
+    if ( ! is_buddypress() || ! $is_post_null ) {
+        return $comment_data;
+    }
+
+    if ( isset( $wp_comment_query->query_vars['count'] ) && $wp_comment_query->query_vars['count'] ) {
+        $comment_data = 0;
+    } else {
+        $comment_data = array();
+    }
+
+    return $comment_data;
+}
+
+/**
  * Do not allow {@link comments_template()} to render during theme compatibility.
  *