Changeset 7763

Timestamp:

10/01/2026 04:50:02 AM (8 days ago)

Author:

johnjamesjacoby

Message:

Blocks: Avoid unused editor queries.

Skip localization when the receiving script is unavailable, preventing front-end editor integrations from triggering expensive choice queries on unrelated logged-in requests. Simplify topic-tag visibility checks by requiring the canonical post parent and stored forum ID to agree, removing redundant forum lists and a correlated anti-join.

In trunk, for 2.7.

Props ocean90.

Location:

trunk

Files:

• CHANGELOG.md (modified) (1 diff)
• src/includes/common/blocks.php (modified) (3 diffs)
• tests/phpunit/testcases/common/block-visibility.php (modified) (2 diffs)

trunk/CHANGELOG.md

@@ -124 +124 @@
 ### Fixed
 
+- Avoided block editor choice queries when their target script is unavailable.
 - Kept forum exclusions active in topic and reply queries using OR metadata conditions.
 - Corrected topic edit-lock owner detection.

trunk/src/includes/common/blocks.php

@@ -130 +130 @@
                  */
                 public function enqueue_block_editor_assets() {
+
+                        // Bail if the script receiving this data is unavailable.
+                        if ( ! wp_script_is( 'bbp-admin-blocks', 'registered' ) ) {
+                                return;
+                        }
 
                         // Localize script data for the block editor (script is loaded via block.json).
@@ -382 +387 @@
                         $placeholders       = implode( ', ', array_fill( 0, count( $statuses ), '%s' ) );
                         $forum_placeholders = implode( ', ', array_fill( 0, count( $forum_ids ), '%d' ) );
-                        $values             = array_merge( array( bbp_get_topic_tag_tax_id(), bbp_get_topic_post_type() ), $statuses, $forum_ids, $forum_ids, $forum_ids );
+                        $values             = array_merge( array( bbp_get_topic_tag_tax_id(), bbp_get_topic_post_type() ), $statuses, $forum_ids );
                         $query              = "SELECT DISTINCT tt.term_id
                                 FROM {$bbp_db->term_taxonomy} AS tt
@@ -390 +395 @@
                                 WHERE tt.taxonomy = %s AND p.post_type = %s AND p.post_status IN ({$placeholders})
                                         AND p.post_parent IN ({$forum_placeholders})
-                                        AND CAST( fm.meta_value AS UNSIGNED ) IN ({$forum_placeholders})
-                                        AND NOT EXISTS (
-                                                SELECT 1 FROM {$bbp_db->postmeta} AS excluded_fm
-                                                WHERE excluded_fm.post_id = p.ID AND excluded_fm.meta_key = '_bbp_forum_id'
-                                                AND CAST( excluded_fm.meta_value AS UNSIGNED ) NOT IN ({$forum_placeholders})
-                                        )";
+                                        AND CAST( fm.meta_value AS UNSIGNED ) = p.post_parent";
                         $term_ids = $bbp_db->get_col( $bbp_db->prepare( $query, $values ) );
 

trunk/tests/phpunit/testcases/common/block-visibility.php

@@ -9 +9 @@
  */
 class BBP_Tests_Common_Block_Visibility extends BBP_UnitTestCase {
+
+        /**
+         * @covers ::BBP_Blocks::enqueue_block_editor_assets
+         */
+        public function test_editor_choices_only_load_for_registered_admin_script() {
+                $forum_id = $this->factory->forum->create();
+                $this->factory->topic->create( array( 'post_parent' => $forum_id, 'topic_meta' => array( 'forum_id' => $forum_id ) ) );
+                $scripts     = wp_scripts();
+                $registered  = isset( $scripts->registered['bbp-admin-blocks'] ) ? $scripts->registered['bbp-admin-blocks'] : null;
+                $query_count = 0;
+                $count_query = function( $query ) use ( &$query_count ) {
+                        if ( false !== strpos( $query, 'SELECT DISTINCT tt.term_id' ) ) {
+                                ++$query_count;
+                        }
+                        return $query;
+                };
+
+                wp_deregister_script( 'bbp-admin-blocks' );
+                add_filter( 'query', $count_query );
+
+                try {
+                        $this->assertNotFalse( has_action( 'enqueue_block_editor_assets', array( bbpress()->blocks, 'enqueue_block_editor_assets' ) ) );
+                        do_action( 'enqueue_block_editor_assets' );
+                        $this->assertSame( 0, $query_count );
+                        $this->assertFalse( $scripts->get_data( 'bbp-admin-blocks', 'data' ) );
+
+                        wp_register_script( 'bbp-admin-blocks', false );
+                        bbpress()->blocks->enqueue_block_editor_assets();
+                        $this->assertGreaterThan( 0, $query_count );
+                        $this->assertStringContainsString( 'bbpBlocksJS', $scripts->get_data( 'bbp-admin-blocks', 'data' ) );
+                } finally {
+                        remove_filter( 'query', $count_query );
+                        wp_deregister_script( 'bbp-admin-blocks' );
+                        if ( null !== $registered ) {
+                                $scripts->registered['bbp-admin-blocks'] = $registered;
+                        }
+                }
+        }
 
         /**
@@ -121 +159 @@
                 $this->assertContains( 'public-block-tag', $labels );
 
+                delete_post_meta( $public_topic, '_bbp_forum_id' );
+                $labels = wp_list_pluck( BBP_Blocks::get_localize_script_data( 'topic_tags' ), 'label' );
+                $this->assertNotContains( 'public-block-tag', $labels );
+
+                update_post_meta( $public_topic, '_bbp_forum_id', 'not-a-forum' );
+                $labels = wp_list_pluck( BBP_Blocks::get_localize_script_data( 'topic_tags' ), 'label' );
+                $this->assertNotContains( 'public-block-tag', $labels );
+
                 wp_update_post( array( 'ID' => $public_topic, 'post_parent' => $private_forum ) );
                 update_post_meta( $public_topic, '_bbp_forum_id', $private_forum );