Changeset 27801

Timestamp:

03/28/2014 02:43:04 AM (11 years ago)

Author:

nacin

Message:

Always decode special characters for email subjects.

props tlovett1, jeremyfelt.
fixes #25346.

Location:

trunk/src

Files:

• wp-admin/includes/class-wp-upgrader.php (modified) (2 diffs)
• wp-admin/includes/ms.php (modified) (2 diffs)
• wp-admin/ms-delete-site.php (modified) (1 diff)
• wp-admin/user-new.php (modified) (1 diff)
• wp-includes/ms-functions.php (modified) (4 diffs)
• wp-includes/pluggable.php (modified) (2 diffs)
• wp-login.php (modified) (1 diff)

trunk/src/wp-admin/includes/class-wp-upgrader.php

@@ -2421 +2421 @@
         $email = apply_filters( 'auto_core_update_email', $email, $type, $core_update, $result );
 
-        wp_mail( $email['to'], $email['subject'], $email['body'], $email['headers'] );
+        wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
     }
 
@@ -2571 +2571 @@
         $email = apply_filters( 'automatic_updates_debug_email', $email, $failures, $this->update_results );
 
-        wp_mail( $email['to'], $email['subject'], $email['body'], $email['headers'] );
+        wp_mail( $email['to'], wp_specialchars_decode( $email['subject'] ), $email['body'], $email['headers'] );
     }
 }

trunk/src/wp-admin/includes/ms.php

@@ -260 +260 @@
     $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
-    wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), get_option( 'blogname' ) ), $content );
+    wp_mail( $value, sprintf( __( '[%s] New Admin Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
 }
 add_action( 'update_option_new_admin_email', 'update_option_new_admin_email', 10, 2 );
@@ -329 +329 @@
         $content = str_replace( '###SITEURL###', network_home_url(), $content );
 
-        wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), get_option( 'blogname' ) ), $content );
+        wp_mail( $_POST['email'], sprintf( __( '[%s] New Email Address' ), wp_specialchars_decode( get_option( 'blogname' ) ) ), $content );
         $_POST['email'] = $current_user->user_email;
     }

trunk/src/wp-admin/ms-delete-site.php

@@ -69 +69 @@
     $content = str_replace( '###SITE_NAME###', $current_site->site_name, $content );
 
-    wp_mail( get_option( 'admin_email' ), "[ " . get_option( 'blogname' ) . " ] ".__( 'Delete My Site' ), $content );
+    wp_mail( get_option( 'admin_email' ), "[ " . wp_specialchars_decode( get_option( 'blogname' ) ) . " ] ".__( 'Delete My Site' ), $content );
     ?>
 

trunk/src/wp-admin/user-new.php

@@ -86 +86 @@
 Please click the following link to confirm the invite:
 %4$s' );
-            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/" ) ) );
+            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/" ) ) );
             $redirect = add_query_arg( array('update' => 'add'), 'user-new.php' );
         }

trunk/src/wp-includes/ms-functions.php

@@ -881 +881 @@
         esc_url( 'http://' . $domain . $path )
     );
-    wp_mail($user_email, $subject, $message, $message_headers);
+    wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
     return true;
 }
@@ -966 +966 @@
         $user
     );
-    wp_mail($user_email, $subject, $message, $message_headers);
+    wp_mail( $user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
     return true;
 }
@@ -1522 +1522 @@
      */
     $subject = apply_filters( 'update_welcome_subject', sprintf( __( 'New %1$s Site: %2$s' ), $current_site->site_name, wp_unslash( $title ) ) );
-    wp_mail($user->user_email, $subject, $message, $message_headers);
+    wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
     return true;
 }
@@ -1600 +1600 @@
      */
     $subject = apply_filters( 'update_welcome_user_subject', sprintf( __( 'New %1$s User: %2$s' ), $current_site->site_name, $user->user_login) );
-    wp_mail($user->user_email, $subject, $message, $message_headers);
+    wp_mail( $user->user_email, wp_specialchars_decode( $subject ), $message, $message_headers );
     return true;
 }

trunk/src/wp-includes/pluggable.php

@@ -1169 +1169 @@
 
     foreach ( $emails as $email ) {
-        @wp_mail( $email, $subject, $notify_message, $message_headers );
+        @wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
     }
 
@@ -1256 +1256 @@
 
     foreach ( $emails as $email ) {
-        @wp_mail( $email, $subject, $notify_message, $message_headers );
+        @wp_mail( $email, wp_specialchars_decode( $subject ), $notify_message, $message_headers );
     }
 

trunk/src/wp-login.php

@@ -389 +389 @@
     $message = apply_filters( 'retrieve_password_message', $message, $key );
 
-    if ( $message && !wp_mail($user_email, $title, $message) )
+    if ( $message && !wp_mail( $user_email, wp_specialchars_decode( $title ), $message ) )
         wp_die( __('The e-mail could not be sent.') . "<br />\n" . __('Possible reason: your host may have disabled the mail() function.') );