Ticket #43542: 43542.2.diff

src/wp-admin/includes/template.php

@@ -1099 +1099 @@
 
         $hidden = get_hidden_meta_boxes( $screen );
 
-        printf( '<div id="%s-sortables" class="meta-box-sortables">', htmlspecialchars( $context ) );
+        printf( '<div id="%s-sortables" class="meta-box-sortables">', esc_attr( $context, $flags = NULL, $encoding = 'UTF-8' ) );
 
         // Grab the ones the user has manually sorted. Pull them out of their previous context/priority and into the one the user chose
         if ( ! $already_sorted && $sorted = get_user_option( "meta-box-order_$page" ) ) {

src/wp-includes/class-wp-editor.php

@@ -284 +284 @@
                         remove_filter( 'the_editor_content', 'format_for_editor' );
                 }
 
+                // Back-compat for the `htmledit_pre` and `richedit_pre` filters
                 // Back-compat for the `htmledit_pre` and `richedit_pre` filters
                 if ( 'html' === $default_editor && has_filter( 'htmledit_pre' ) ) {
-                        // TODO: needs _deprecated_filter(), use _deprecated_function() as substitute for now
-                        _deprecated_function( 'add_filter( htmledit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
-                        $content = apply_filters( 'htmledit_pre', $content );
+                        $content = apply_filters_deprecated( 'htmledit_pre', array( $content ), '4.3.0', 'format_for_editor' );
                 } elseif ( 'tinymce' === $default_editor && has_filter( 'richedit_pre' ) ) {
-                        _deprecated_function( 'add_filter( richedit_pre )', '4.3.0', 'add_filter( format_for_editor )' );
-                        $content = apply_filters( 'richedit_pre', $content );
+                        $content = apply_filters_deprecated( 'richedit_pre', array( $content ), '4.3.0', 'format_for_editor' );
                 }
 
                 if ( false !== stripos( $content, 'textarea' ) ) {

src/wp-includes/pluggable.php

@@ -454 +454 @@
                 $phpmailer->CharSet = apply_filters( 'wp_mail_charset', $charset );
 
                 // Set custom headers
-                if ( ! empty( $headers ) ) {
-                        foreach ( (array) $headers as $name => $content ) {
-                                $phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
-                        }
+                if ( !empty( $headers ) ) {
+      foreach ( (array) $headers as $name => $content ) {
+        // Only add custom header if not one that will be added automatically
+        // by wp-includes/class-phpmailer.php
+        if ( ( 'MIME-Version' !== $name ) && ( 'X-Mailer' !== $name ) ) {
+          $phpmailer->addCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
+                                }
+    }
 
                         if ( false !== stripos( $content_type, 'multipart' ) && ! empty( $boundary ) ) {
                                 $phpmailer->addCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
@@ -2733 +2737 @@
                 return $r;
         }
 endif;
-