Ticket #44396: 44396.2.diff

src/wp-includes/user.php

@@ -2733 +2733 @@
                 );
                 update_user_meta( $current_user->ID, '_new_email', $new_user_email );
 
-                if ( is_multisite() ) {
-                        $sitename = get_site_option( 'site_name' );
-                } else {
-                        $sitename = get_option( 'blogname' );
-                }
+                $sitename = get_option( 'blogname' );
 
                 /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */
                 $email_text = __(
@@ -2785 +2781 @@
                 $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail=' . $hash ) ), $content );
                 $content = str_replace( '###EMAIL###', $_POST['email'], $content );
                 $content = str_replace( '###SITENAME###', wp_specialchars_decode( $sitename, ENT_QUOTES ), $content );
-                $content = str_replace( '###SITEURL###', network_home_url(), $content );
+                $content = str_replace( '###SITEURL###', home_url(), $content );
 
                 wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ) ), $content );
 
@@ -3055 +3051 @@
         $content = str_replace( '###MANAGE_URL###', esc_url_raw( $email_data['manage_url'] ), $content );
         $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
 
-        $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+        $sitename = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 
         $subject = sprintf(
                 /* translators: 1: Site name. 2: Name of the confirmed action. */
                 __( '[%1$s] Action Confirmed: %2$s' ),
-                $blogname,
+                $sitename,
                 $action_description
         );
 
@@ -3070 +3066 @@
          * @since 4.9.7
          *
          * @param string $subject    The email subject.
-         * @param string $blogname   The name of the site.
+         * @param string $sitename   The name of the site.
          * @param array  $email_data {
          *     Data relating to the account action email.
          *
@@ -3083 +3079 @@
          *     @type string          $admin_email The administrator email receiving the mail.
          * }
          */
-        $subject = apply_filters( 'user_request_confirmed_email_subject', $subject, $blogname, $email_data );
+        $subject = apply_filters( 'user_request_confirmed_email_subject', $subject, $sitename, $email_data );
 
         $email_sent = wp_mail( $email_data['admin_email'], $subject, $content );
 
@@ -3360 +3356 @@
                         'request_id'  => $request_id,
                         'confirm_key' => wp_generate_user_request_key( $request_id ),
                 ), wp_login_url() ),
-                'sitename'    => is_multisite() ? get_site_option( 'site_name' ) : get_option( 'blogname' ),
-                'siteurl'     => network_home_url(),
+                'sitename'    => get_option( 'blogname' ),
+                'siteurl'     => home_url(),
         );
 
         /* translators: Do not translate DESCRIPTION, CONFIRM_URL, SITENAME, SITEURL: those are placeholders. */
@@ -3415 +3411 @@
         $content = str_replace( '###SITENAME###', wp_specialchars_decode( $email_data['sitename'], ENT_QUOTES ), $content );
         $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content );
 
-        $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
+        $sitename = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
 
         /* translators: Privacy data request subject. 1: Site name, 2: Name of the action */
-        $subject = sprintf( __( '[%1$s] Confirm Action: %2$s' ), $blogname, $email_data['description'] );
+        $subject = sprintf( __( '[%1$s] Confirm Action: %2$s' ), $sitename, $email_data['description'] );
 
         /**
          * Filters the subject of the email sent when an account action is attempted.
@@ -3426 +3422 @@
          * @since 4.9.6
          *
          * @param string $subject    The email subject.
-         * @param string $blogname   The name of the site.
+         * @param string $sitename   The name of the site.
          * @param array  $email_data {
          *     Data relating to the account action email.
          *
@@ -3438 +3434 @@
          *     @type string          $siteurl     The site URL sending the mail.
          * }
          */
-        $subject = apply_filters( 'user_request_action_email_subject', $subject, $blogname, $email_data );
+        $subject = apply_filters( 'user_request_action_email_subject', $subject, $sitename, $email_data );
 
         return wp_mail( $email_data['email'], $subject, $content );
 }