Changeset 53093

Timestamp:

04/07/2022 01:33:03 PM (3 years ago)

Author:

gziolo

Message:

Site Editor: Resolve homepage template on server-side

Backports change from Gutenberg to support server-side home template resolution in the Site Editor. Original PR ​https://github.com/WordPress/gutenberg/pull/38817.

Props Mamaduka.
See #55505.

Location:

trunk

Files:

• src/wp-admin/site-editor.php (modified) (2 diffs)
• src/wp-includes/block-template.php (modified) (1 diff)
• tests/phpunit/tests/block-template.php (modified) (1 diff)

trunk/src/wp-admin/site-editor.php

@@ -22 +22 @@
 if ( ! wp_is_block_theme() ) {
     wp_die( __( 'The theme you are currently using is not compatible with Full Site Editing.' ) );
+}
+
+/**
+ * Do a server-side redirection if missing `postType` and `postId`
+ * query args when visiting Site Editor.
+ */
+$home_template = _resolve_home_block_template();
+if ( $home_template && empty( $_GET['postType'] ) && empty( $_GET['postId'] ) ) {
+    $redirect_url = add_query_arg(
+        $home_template,
+        admin_url( 'site-editor.php' )
+    );
+    wp_safe_redirect( $redirect_url );
+    exit;
 }
 
@@ -57 +71 @@
     'defaultTemplateTypes'                 => $indexed_template_types,
     'defaultTemplatePartAreas'             => get_allowed_block_template_part_areas(),
+    '__unstableHomeTemplate'               => $home_template,
     '__experimentalBlockPatterns'          => WP_Block_Patterns_Registry::get_instance()->get_all_registered(),
     '__experimentalBlockPatternCategories' => WP_Block_Pattern_Categories_Registry::get_instance()->get_all_registered(),

trunk/src/wp-includes/block-template.php

@@ -332 +332 @@
     }
 }
+
+/**
+ * Returns the correct template for the site's home page.
+ *
+ * @access private
+ * @since 6.0.0
+ *
+ * @return array|null A template object, or null if none could be found.
+ */
+function _resolve_home_block_template() {
+    $show_on_front = get_option( 'show_on_front' );
+    $front_page_id = get_option( 'page_on_front' );
+
+    if ( 'page' === $show_on_front && $front_page_id ) {
+        return array(
+            'postType' => 'page',
+            'postId'   => $front_page_id,
+        );
+    }
+
+    $hierarchy = array( 'front-page', 'home', 'index' );
+    $template  = resolve_block_template( 'home', $hierarchy, '' );
+
+    if ( ! $template ) {
+        return null;
+    }
+
+    return array(
+        'postType' => 'wp_template',
+        'postId'   => $template->id,
+    );
+}

trunk/tests/phpunit/tests/block-template.php

@@ -189 +189 @@
         $this->assertSame( '', $resolved_template_path );
     }
+
+    /**
+     * Covers: https://github.com/WordPress/gutenberg/pull/38817.
+     *
+     * @ticket 55505
+     */
+    public function test_resolve_home_block_template_default_hierarchy() {
+        $template = _resolve_home_block_template();
+
+        $this->assertSame( 'wp_template', $template['postType'] );
+        $this->assertSame( get_stylesheet() . '//index', $template['postId'] );
+    }
+
+    /**
+     * @ticket 55505
+     */
+    public function test_resolve_home_block_template_static_homepage() {
+        $post_id = self::factory()->post->create( array( 'post_type' => 'page' ) );
+        update_option( 'show_on_front', 'page' );
+        update_option( 'page_on_front', $post_id );
+
+        $template = _resolve_home_block_template();
+
+        $this->assertSame( 'page', $template['postType'] );
+        $this->assertSame( $post_id, $template['postId'] );
+
+        delete_option( 'show_on_front', 'page' );
+    }
+
+    /**
+     * @ticket 55505
+     */
+    public function test_resolve_home_block_template_no_resolution() {
+        switch_theme( 'stylesheetonly' );
+        $template = _resolve_home_block_template();
+
+        $this->assertNull( $template );
+    }
 }