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.

git-svn-id: https://develop.svn.wordpress.org/branches/6.8@60194 602fd350-edb4-49c9-b593-d223f7449a82

Author: desrosj

src/wp-includes/admin-bar.php

@@ -458,27 +458,36 @@ function wp_admin_bar_site_menu( $wp_admin_bar ) {
  * @since 5.9.0
  * @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.
 	if ( ! wp_is_block_theme() ) {
 		return;
 	}
 
-	// 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;
 	}
 
 	$wp_admin_bar->add_node(
 		array(
 			'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' )
+			),
 		)
 	);
 }