Changeset 56209

Timestamp:

07/11/2023 11:31:48 AM (10 months ago)

Author:

mikeschroder

Message:

Toolbar: Make the 'Edit site' link open the editor with the current template.

Adds a global, $_wp_current_template_id, to allow the 'Edit site' link in the admin bar to be aware of the current template and pass it to the Site Editor, so it can load the appropriate one directly.

See ​https://github.com/WordPress/gutenberg/issues/37850 for further discussion.

Props Mamaduka, poena, abitofmind, audrasjb, mikinc860, alexstine, annezazu, beckej, jameskoster, bacoords, clubkert, paaljoachim, get_dave, priethor, skorasaurus.
Fixes #58746.

Location:

trunk/src/wp-includes

Files:

• admin-bar.php (modified) (2 diffs)
• block-template.php (modified) (3 diffs)

trunk/src/wp-includes/admin-bar.php

@@ -420 +420 @@
  * @since 5.9.0
  *
+ * @global string $_wp_current_template_id
+ * @since 6.3.0 Added `$_wp_current_template_id` global for editing of current template directly from the admin bar.
+ *
  * @param WP_Admin_Bar $wp_admin_bar The WP_Admin_Bar instance.
  */
 function wp_admin_bar_edit_site_menu( $wp_admin_bar ) {
+    global $_wp_current_template_id;
+
     // Don't show if a block theme is not activated.
     if ( ! wp_is_block_theme() ) {
@@ -437 +442 @@
             'id'    => 'site-editor',
             'title' => __( 'Edit site' ),
-            'href'  => admin_url( 'site-editor.php' ),
+            'href'  => add_query_arg(
+                array(
+                    'postType' => 'wp_template',
+                    'postId'   => $_wp_current_template_id,
+                ),
+                admin_url( 'site-editor.php' )
+            ),
         )
     );

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

@@ -24 +24 @@
  *
  * @since 5.8.0
+ * @since 6.3.0 Added `$_wp_current_template_id` global for editing of current template directly from the admin bar.
  *
  * @global string $_wp_current_template_content
+ * @global string $_wp_current_template_id
  *
  * @param string   $template  Path to the template. See locate_template().
@@ -33 +35 @@
  */
 function locate_block_template( $template, $type, array $templates ) {
-    global $_wp_current_template_content;
+    global $_wp_current_template_content, $_wp_current_template_id;
 
     if ( ! current_theme_supports( 'block-templates' ) ) {
@@ -65 +67 @@
 
     if ( $block_template ) {
+        $_wp_current_template_id = $block_template->id;
+
         if ( empty( $block_template->content ) && is_user_logged_in() ) {
             $_wp_current_template_content =