Changeset 60194

Timestamp:

04/28/2025 03:10:49 PM (3 weeks ago)

Author:

desrosj

Message:

Admin bar: Update the "Edit Site" link to 6.7 destination.

This reverts [59910] and changes the "Edit Site" link to be the current template rather than the top-level screen of the Site Editor.

Reviewed by SergeyBiryukov, desrosj.
Merges [60193] to the 6.8 branch.

Props wildworks, joemcgill, poena, westonruter, nickwilmot, marktimemedia, eduwass, lilgames, codeamp, jeffr0, jorbin.
Fixes #63358. See #62368.

Location:

branches/6.8

Files:

• . (modified) (1 prop)
• src/wp-includes/admin-bar.php (modified) (3 diffs)

branches/6.8/src/wp-includes/admin-bar.php

@@ -459 +459 @@
  * @since 6.3.0 Added `$_wp_current_template_id` global for editing of current template directly from the admin bar.
  * @since 6.6.0 Added the `canvas` query arg to the Site Editor link.
- * @since 6.8.0 Removed the query args to ensure that the link opens the starting screen of the Site Editor.
+ *
+ * @global string $_wp_current_template_id
  *
  * @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.
@@ -470 +472 @@
     }
 
-    // Don't show for users who can't edit theme options.
-    if ( ! current_user_can( 'edit_theme_options' ) ) {
+    // Don't show for users who can't edit theme options or when in the admin.
+    if ( ! current_user_can( 'edit_theme_options' ) || is_admin() ) {
         return;
     }
@@ -479 +481 @@
             '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,
+                    'canvas'   => 'edit',
+                ),
+                admin_url( 'site-editor.php' )
+            ),
         )
     );