Ticket #9913: html_entity_decode_blogname.diff

pluggable.php

@@ -977 +977 @@
 
         $comment_author_domain = @gethostbyaddr($comment->comment_author_IP);
 
-        $blogname = get_option('blogname');
+        $blogname = @html_entity_decode(get_option('blogname'), ENT_QUOTES, get_option('blog_charset'));
 
         if ( empty( $comment_type ) ) $comment_type = 'comment';
 
@@ -1103 +1103 @@
                 'Currently %s comments are waiting for approval. Please visit the moderation panel:', $comments_waiting), number_format_i18n($comments_waiting) ) . "\r\n";
         $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"'), @html_entity_decode(get_option('blogname'), ENT_QUOTES, get_option('blog_charset')), $post->post_title );
         $admin_email = get_option('admin_email');
         $message_headers = '';
 
@@ -1130 +1130 @@
         // but check to see if it's the admin whose password we're changing, and skip this
         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);
         }
 }
 endif;
@@ -1149 +1149 @@
 
         $user_login = stripslashes($user->user_login);
         $user_email = stripslashes($user->user_email);
+        $blogname = @html_entity_decode(get_option('blogname'), ENT_QUOTES, get_option('blog_charset'));
 
-        $message  = sprintf(__('New user registration on your blog %s:'), get_option('blogname')) . "\r\n\r\n";
+        $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) )
                 return;
@@ -1163 +1164 @@
         $message .= sprintf(__('Password: %s'), $plaintext_pass) . "\r\n";
         $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);
 
 }
 endif;