Changeset 43388
- Timestamp:
- 07/03/2018 04:59:36 PM (6 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/wp-includes/user.php
r43379 r43388 2734 2734 update_user_meta( $current_user->ID, '_new_email', $new_user_email ); 2735 2735 2736 if ( is_multisite() ) { 2737 $sitename = get_site_option( 'site_name' ); 2738 } else { 2739 $sitename = get_option( 'blogname' ); 2740 } 2736 $sitename = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ); 2741 2737 2742 2738 /* translators: Do not translate USERNAME, ADMIN_URL, EMAIL, SITENAME, SITEURL: those are placeholders. */ … … 2785 2781 $content = str_replace( '###ADMIN_URL###', esc_url( admin_url( 'profile.php?newuseremail=' . $hash ) ), $content ); 2786 2782 $content = str_replace( '###EMAIL###', $_POST['email'], $content ); 2787 $content = str_replace( '###SITENAME###', wp_specialchars_decode( $sitename, ENT_QUOTES ), $content );2788 $content = str_replace( '###SITEURL###', network_home_url(), $content );2789 2790 wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )), $content );2783 $content = str_replace( '###SITENAME###', $sitename, $content ); 2784 $content = str_replace( '###SITEURL###', home_url(), $content ); 2785 2786 wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), $sitename ), $content ); 2791 2787 2792 2788 $_POST['email'] = $current_user->user_email; … … 2998 2994 'description' => $action_description, 2999 2995 'manage_url' => $manage_url, 3000 'sitename' => get_option( 'blogname'),2996 'sitename' => wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), 3001 2997 'siteurl' => home_url(), 3002 2998 'admin_email' => $admin_email, … … 3050 3046 $content = apply_filters( 'user_confirmed_action_email_content', $email_text, $email_data ); 3051 3047 3052 $content = str_replace( '###SITENAME###', wp_specialchars_decode( $email_data['sitename'], ENT_QUOTES ), $content );3048 $content = str_replace( '###SITENAME###', $email_data['sitename'], $content ); 3053 3049 $content = str_replace( '###USER_EMAIL###', $email_data['user_email'], $content ); 3054 3050 $content = str_replace( '###DESCRIPTION###', $email_data['description'], $content ); … … 3056 3052 $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content ); 3057 3053 3058 $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );3059 3060 3054 $subject = sprintf( 3061 3055 /* translators: 1: Site name. 2: Name of the confirmed action. */ 3062 3056 __( '[%1$s] Action Confirmed: %2$s' ), 3063 $ blogname,3057 $email_data['sitename'], 3064 3058 $action_description 3065 3059 ); … … 3071 3065 * 3072 3066 * @param string $subject The email subject. 3073 * @param string $ blogname The name of the site.3067 * @param string $sitename The name of the site. 3074 3068 * @param array $email_data { 3075 3069 * Data relating to the account action email. … … 3084 3078 * } 3085 3079 */ 3086 $subject = apply_filters( 'user_request_confirmed_email_subject', $subject, $ blogname, $email_data );3080 $subject = apply_filters( 'user_request_confirmed_email_subject', $subject, $email_data['sitename'], $email_data ); 3087 3081 3088 3082 $email_sent = wp_mail( $email_data['admin_email'], $subject, $content ); … … 3114 3108 return; 3115 3109 } 3116 3117 $subject = sprintf(3118 /* translators: %s Site name. */3119 __( '[%s] Erasure Request Fulfilled' ),3120 wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES )3121 );3122 3110 3123 3111 /** … … 3135 3123 'message_recipient' => $user_email, 3136 3124 'privacy_policy_url' => get_privacy_policy_url(), 3137 'sitename' => get_option( 'blogname'),3125 'sitename' => wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), 3138 3126 'siteurl' => home_url(), 3127 ); 3128 3129 $subject = sprintf( 3130 /* translators: %s: Site name. */ 3131 __( '[%s] Erasure Request Fulfilled' ), 3132 $email_data['sitename'] 3139 3133 ); 3140 3134 … … 3198 3192 $content = apply_filters( 'user_confirmed_action_email_content', $email_text, $email_data ); 3199 3193 3200 $content = str_replace( '###SITENAME###', wp_specialchars_decode( $email_data['sitename'], ENT_QUOTES ), $content );3194 $content = str_replace( '###SITENAME###', $email_data['sitename'], $content ); 3201 3195 $content = str_replace( '###PRIVACY_POLICY_URL###', $email_data['privacy_policy_url'], $content ); 3202 3196 $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content ); … … 3361 3355 'confirm_key' => wp_generate_user_request_key( $request_id ), 3362 3356 ), wp_login_url() ), 3363 'sitename' => is_multisite() ? get_site_option( 'site_name' ) : get_option( 'blogname'),3364 'siteurl' => network_home_url(),3357 'sitename' => wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES ), 3358 'siteurl' => home_url(), 3365 3359 ); 3366 3360 … … 3413 3407 $content = str_replace( '###CONFIRM_URL###', esc_url_raw( $email_data['confirm_url'] ), $content ); 3414 3408 $content = str_replace( '###EMAIL###', $email_data['email'], $content ); 3415 $content = str_replace( '###SITENAME###', wp_specialchars_decode( $email_data['sitename'], ENT_QUOTES ), $content );3409 $content = str_replace( '###SITENAME###', $email_data['sitename'], $content ); 3416 3410 $content = str_replace( '###SITEURL###', esc_url_raw( $email_data['siteurl'] ), $content ); 3417 3411 3418 $blogname = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );3419 3420 3412 /* translators: Privacy data request subject. 1: Site name, 2: Name of the action */ 3421 $subject = sprintf( __( '[%1$s] Confirm Action: %2$s' ), $ blogname, $email_data['description'] );3413 $subject = sprintf( __( '[%1$s] Confirm Action: %2$s' ), $email_data['sitename'], $email_data['description'] ); 3422 3414 3423 3415 /** … … 3427 3419 * 3428 3420 * @param string $subject The email subject. 3429 * @param string $ blogname The name of the site.3421 * @param string $sitename The name of the site. 3430 3422 * @param array $email_data { 3431 3423 * Data relating to the account action email. … … 3439 3431 * } 3440 3432 */ 3441 $subject = apply_filters( 'user_request_action_email_subject', $subject, $ blogname, $email_data );3433 $subject = apply_filters( 'user_request_action_email_subject', $subject, $email_data['sitename'], $email_data ); 3442 3434 3443 3435 return wp_mail( $email_data['email'], $subject, $content );
Note: See TracChangeset
for help on using the changeset viewer.