Changeset 12388

Timestamp:

12/13/2009 11:38:45 AM (16 years ago)

Author:

westi

Message:

Don't html encode quotes in the blogname in email subjects as this is a plain text output. Fixes #9913 props tenpura.

File:

• trunk/wp-includes/pluggable.php (modified) (6 diffs)

trunk/wp-includes/pluggable.php

@@ -977 +977 @@
 
     $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
-
-    $blogname = get_option('blogname');
+    
+    // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+    // we want to reverse this for the plain text arena of emails.
+    $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
 
     if ( empty( $comment_type ) ) $comment_type = 'comment';
@@ -1068 +1070 @@
     $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
     $comments_waiting = $wpdb->get_var("SELECT count(comment_ID) FROM $wpdb->comments WHERE comment_approved = '0'");
-
+    
+    // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+    // we want to reverse this for the plain text arena of emails.
+    $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+    
     switch ($comment->comment_type)
     {
@@ -1104 +1110 @@
     $notify_message .= admin_url("edit-comments.php?comment_status=moderated") . "\r\n";
 
-    $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), get_option('blogname'), $post->post_title );
+    $subject = sprintf( __('[%1$s] Please moderate: "%2$s"'), $blogname, $post->post_title );
     $admin_email = get_option('admin_email');
     $message_headers = '';
@@ -1131 +1137 @@
     if ( $user->user_email != get_option('admin_email') ) {
         $message = sprintf(__('Password Lost and Changed for user: %s'), $user->user_login) . "\r\n";
-        wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), get_option('blogname')), $message);
+        wp_mail(get_option('admin_email'), sprintf(__('[%s] Password Lost/Changed'), @html_entity_decode(get_option('blogname'), ENT_QUOTES, get_option('blog_charset'))), $message);
     }
 }
@@ -1150 +1156 @@
     $user_login = stripslashes($user->user_login);
     $user_email = stripslashes($user->user_email);
-
-    $message  = sprintf(__('New user registration on your blog %s:'), get_option('blogname')) . "\r\n\r\n";
+    
+    // The blogname option is escaped with esc_html on the way into the database in sanitize_option
+    // we want to reverse this for the plain text arena of emails.
+    $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
+
+    $message  = sprintf(__('New user registration on your blog %s:'), $blogname) . "\r\n\r\n";
     $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
     $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";
 
-    @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), get_option('blogname')), $message);
+    @wp_mail(get_option('admin_email'), sprintf(__('[%s] New User Registration'), $blogname), $message);
 
     if ( empty($plaintext_pass) )
@@ -1164 +1174 @@
     $message .= wp_login_url() . "\r\n";
 
-    wp_mail($user_email, sprintf(__('[%s] Your username and password'), get_option('blogname')), $message);
+    wp_mail($user_email, sprintf(__('[%s] Your username and password'), $blogname), $message);
 
 }