Changeset 56051

Timestamp:

06/27/2023 05:34:12 AM (18 months ago)

Author:

isabel_brison

Message:

REST API: ignore empty templates.

Ignore empty templates when using the /lookup endpoint in the WP_REST_Templates_Controller class.

Props ramonopoly, jorgefilipecosta, spacedmonkey, youknowriad, mukesh27.
Fixes #58615.

Location:

trunk

Files:

• src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php (modified) (2 diffs)
• tests/phpunit/tests/rest-api/wpRestTemplatesController.php (modified) (1 diff)

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-templates-controller.php

@@ -151 +151 @@
      *
      * @since 6.1.0
+     * @since 6.3.0 Ignore empty templates.
      *
      * @param WP_REST_Request $request The request instance.
@@ -156 +157 @@
      */
     public function get_template_fallback( $request ) {
-        $hierarchy         = get_template_hierarchy( $request['slug'], $request['is_custom'], $request['template_prefix'] );
-        $fallback_template = resolve_block_template( $request['slug'], $hierarchy, '' );
-        $response          = $this->prepare_item_for_response( $fallback_template, $request );
+        $hierarchy = get_template_hierarchy( $request['slug'], $request['is_custom'], $request['template_prefix'] );
+
+        do {
+            $fallback_template = resolve_block_template( $request['slug'], $hierarchy, '' );
+            array_shift( $hierarchy );
+        } while ( ! empty( $hierarchy ) && empty( $fallback_template->content ) );
+
+        $response = $this->prepare_item_for_response( $fallback_template, $request );
+
         return rest_ensure_response( $response );
     }

trunk/tests/phpunit/tests/rest-api/wpRestTemplatesController.php

@@ -838 +838 @@
         $response = rest_get_server()->dispatch( $request );
         $this->assertSame( 'page', $response->get_data()['slug'], 'Should fallback to `page.html`.' );
+        // Should fallback to `index.html`.
+        $request->set_param( 'slug', 'author' );
+        $request->set_param( 'ignore_empty', true );
+        $request->set_param( 'template_prefix', 'tag' );
+        $request->set_param( 'is_custom', false );
+        $response = rest_get_server()->dispatch( $request );
+        $this->assertSame( 'index', $response->get_data()['slug'], 'Should fallback to `index.html` when  ignore_empty is `true`.' );
     }
 }