Changeset 11292

Timestamp:

10/22/2021 07:16:10 PM (3 years ago)

Author:

ryelle

Message:

Plugin Directory: Bypass the block plugin search when searching for core blocks.

If a core block (core/*) is disabled or missing from the editor, the missing block handler will try to look for it on WordPress.org, but no plugin should provide core blocks. This will short-circuit out of the block search and return zero results, to avoid issues if a plugin claims to provide the core block.

See #5910.

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-query-plugins.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/api/routes/class-query-plugins.php

@@ -86 +86 @@
          * - `slug:example-plugin` will only return THAT plugin, nothing else.
          * - `block:example-plugin/my-block` will return Block directory plugins, or
-         *    regular plugins that supply that block if there were no matches in the block directory.
-         * 
+         *   regular plugins that supply that block if there were no matches in the block directory.
+         * - `block:core/...` will short-circuit out and return an empty array, since no plugin
+         *   should provide core blocks.
+         *
          * TODO: This might have been useful as a general search filter for the website too.
          */
-        if ( !empty( $query['s'] ) ) {
+        if ( ! empty( $query['s'] ) ) {
+            if ( 'block:core/' === substr( $query['s'], 0, 11 ) ) {
+                return $response;
+            }
+
             if ( 'slug:' === substr( $query['s'], 0, 5 ) ) {
                 $query['name'] = substr( $query['s'], 5 );
-
-                unset( $query['s'] );
             }
 
-            if ( isset( $query['s'] ) && 'block:' === substr( $query['s'], 0, 6 ) ) {
+            if ( 'block:' === substr( $query['s'], 0, 6 ) ) {
                 $query['meta_query'][] = [
                     'key' => 'block_name',
@@ -111 +115 @@
                 // Prioritise block plugins, but try again without the restriction.
                 $try_again_without_tax_query = true;
-
-                unset( $query['s'], $query['block_search'] );
             }
 
+            unset( $query['s'], $query['block_search'] );
         }