Ticket #52314: 52314.6.diff

src/wp-admin/admin-header.php

@@ -49 +49 @@
         /* translators: Admin screen title. %s: Admin screen name. */
         $admin_title = sprintf( __( '%s — WordPress' ), $title );
 } else {
+        $screen_title = $title;
+
+        if ( 'post' === $current_screen->base && 'add' !== $current_screen->action ) {
+                $post_title = get_the_title();
+                if ( ! empty( $post_title ) ) {
+                        $post_type_obj = get_post_type_object( $typenow );
+                        $screen_title  = sprintf(
+                                /* translators: Editor admin screen title. 1: "Edit item" text for the post type, 2: Post title. */
+                                __( '%1$s “%2$s”' ),
+                                $post_type_obj->labels->edit_item,
+                                $post_title
+                        );
+                }
+        }
+
         /* translators: Admin screen title. 1: Admin screen name, 2: Network or site name. */
-        $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $title, $admin_title );
+        $admin_title = sprintf( __( '%1$s ‹ %2$s — WordPress' ), $screen_title, $admin_title );
 }
 
 if ( wp_is_recovery_mode() ) {
@@ -58 +73 @@
         $admin_title = sprintf( __( 'Recovery Mode — %s' ), $admin_title );
 }
 
-if ( 'post' === $current_screen->base && 'add' !== $current_screen->action ) {
-        $post_title = get_the_title();
-        if ( ! empty( $post_title ) ) {
-                $obj = get_post_type_object( $typenow );
-                /* translators: Editor admin screen title. 1: "Edit item" text for the post type, 2: Post title. */
-                $admin_title = sprintf( __( '%1$s “%2$s”' ), $obj->labels->edit_item, $post_title );
-        }
-}
-
 /**
  * Filters the title tag content for an admin page.
  *