Ticket #40348: 40348.patch

src/wp-admin/admin-header.php

@@ -34 +34 @@
 
 if ( is_network_admin() ) {
         /* translators: Network admin screen title. 1: Network name */
-        $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
+        $admin_title = sprintf( __( 'Network Admin: %s' ), esc_html( get_site_option( 'site_name' ) ) );
 } elseif ( is_user_admin() ) {
         /* translators: User dashboard screen title. 1: Network name */
-        $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
+        $admin_title = sprintf( __( 'User Dashboard: %s' ), esc_html( get_site_option( 'site_name' ) ) );
 } else {
         $admin_title = get_bloginfo( 'name' );
 }

src/wp-admin/user/admin.php

@@ -11 +11 @@
 
 require_once( dirname(dirname(__FILE__)) . '/admin.php');
 
-if ( ! is_multisite() ) {
-        wp_redirect( admin_url() );
-        exit;
+if ( is_multisite() ) {
+        $redirect_user_admin_request = ( ( $current_blog->domain !== $current_site->domain ) || ( $current_blog->path !== $current_site->path ) );
+        $redirect_to_url             = user_admin_url();
+} else {
+        $redirect_user_admin_request = true;
+        $redirect_to_url             = admin_url( 'profile.php' );
 }
 
-$redirect_user_admin_request = ( ( $current_blog->domain != $current_site->domain ) || ( $current_blog->path != $current_site->path ) );
 /**
- * Filters whether to redirect the request to the User Admin in Multisite.
+ * Filters whether to redirect the request to the User Admin.
  *
  * @since 3.2.0
  *
@@ -26 +28 @@
  */
 $redirect_user_admin_request = apply_filters( 'redirect_user_admin_request', $redirect_user_admin_request );
 if ( $redirect_user_admin_request ) {
-        wp_redirect( user_admin_url() );
+        wp_redirect( $redirect_to_url );
         exit;
 }
-unset( $redirect_user_admin_request );
+unset( $redirect_user_admin_request, $redirect_to_url );

src/wp-includes/admin-bar.php

@@ -313 +313 @@
 
         if ( is_network_admin() ) {
                 /* translators: %s: site name */
-                $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_network()->site_name ) );
+                $blogname = sprintf( __( 'Network Admin: %s' ), esc_html( get_site_option( 'site_name' ) ) );
         } elseif ( is_user_admin() ) {
                 /* translators: %s: site name */
-                $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_network()->site_name ) );
+                $blogname = sprintf( __( 'User Dashboard: %s' ), esc_html( get_site_option( 'site_name' ) ) );
         }
 
         $title = wp_html_excerpt( $blogname, 40, '…' );