Changeset 59910

Timestamp:

03/03/2025 08:05:52 PM (4 months ago)

Author:

audrasjb

Message:

Admin bar: Update the "Edit Site" link.

This changeset replaces the "Edit Site" link in the admin bar to point to the top level screen of the Site Editor, instead of opening the current template.
Merges Gutenberg changeset: WordPress/gutenberg#69271

Props mosne, poena, audrasjb, shailu25.
Fixes #62368.

File:

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

trunk/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.
- *
- * @global string $_wp_current_template_id
+ * @since 6.8.0 Removed the query args to ensure that the link opens the starting screen of the Site Editor.
  *
  * @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.
@@ -472 +470 @@
     }
 
-    // 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() ) {
+    // Don't show for users who can't edit theme options.
+    if ( ! current_user_can( 'edit_theme_options' ) ) {
         return;
     }
@@ -481 +479 @@
             'id'    => 'site-editor',
             'title' => __( 'Edit Site' ),
-            'href'  => add_query_arg(
-                array(
-                    'postType' => 'wp_template',
-                    'postId'   => $_wp_current_template_id,
-                    'canvas'   => 'edit',
-                ),
-                admin_url( 'site-editor.php' )
-            ),
+            'href'  => admin_url( 'site-editor.php' ),
         )
     );