Ticket #25346: patch-decode-subject-lines.diff
File patch-decode-subject-lines.diff, 2.9 KB (added by , 11 years ago) |
---|
-
wp-admin/includes/ms.php
259 259 $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); 260 260 $content = str_replace( '###SITEURL###', network_home_url(), $content ); 261 261 262 wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), get_option( 'blogname') ), $content );262 wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content ); 263 263 } 264 264 add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); 265 265 add_action( 'add_option_new_admin_email', 'update_option_new_admin_email', 10, 2 ); … … 328 328 $content = str_replace( '###SITENAME###', get_site_option( 'site_name' ), $content ); 329 329 $content = str_replace( '###SITEURL###', network_home_url(), $content ); 330 330 331 wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), get_option( 'blogname') ), $content );331 wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content ); 332 332 $_POST['email'] = $current_user->user_email; 333 333 } 334 334 } -
wp-admin/ms-delete-site.php
68 68 $content = str_replace( '###URL_DELETE###', $url_delete, $content ); 69 69 $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content ); 70 70 71 wp_mail( get_option( 'admin_email' ), "[ " . get_option( 'blogname') . " ] ".__( 'Delete My Site' ), $content );71 wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content ); 72 72 ?> 73 73 74 74 <p><?php _e( 'Thank you. Please check your email for a link to confirm your action. Your site will not be deleted until this link is clicked. ') ?></p> -
wp-admin/user-new.php
85 85 86 86 Please click the following link to confirm the invite: 87 87 %4$s' ); 88 wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), get_option( 'blogname') ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) );88 wp_mail( $new_user_email, sprintf( __( '[%s] Joining confirmation' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), sprintf( $message, get_option( 'blogname' ), home_url(), wp_specialchars_decode( translate_user_role( $role['name'] ) ), home_url( "/newbloguser/$newuser_key/" ) ) ); 89 89 $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' ); 90 90 } 91 91 }