Changeset 40363 for trunk/src/wp-includes/pluggable.php

Timestamp:

04/01/2017 02:33:59 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Mail: Use correct capitalization for PHPMailer methods in wp_mail().

Props Soean, reidbusi.
Fixes #39702.

File:

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

trunk/src/wp-includes/pluggable.php

@@ -309 +309 @@
 
         // Empty out the values that may be set
-        $phpmailer->ClearAllRecipients();
-        $phpmailer->ClearAttachments();
-        $phpmailer->ClearCustomHeaders();
-        $phpmailer->ClearReplyTos();
+        $phpmailer->clearAllRecipients();
+        $phpmailer->clearAttachments();
+        $phpmailer->clearCustomHeaders();
+        $phpmailer->clearReplyTos();
 
         // From email and name
@@ -411 +411 @@
 
         // Set to use PHP's mail()
-        $phpmailer->IsMail();
+        $phpmailer->isMail();
 
         // Set Content-Type and charset
@@ -431 +431 @@
         // Set whether it's plaintext, depending on $content_type
         if ( 'text/html' == $content_type )
-                $phpmailer->IsHTML( true );
+                $phpmailer->isHTML( true );
 
         // If we don't have a charset from the input headers
@@ -451 +451 @@
         if ( !empty( $headers ) ) {
                 foreach ( (array) $headers as $name => $content ) {
-                        $phpmailer->AddCustomHeader( sprintf( '%1$s: %2$s', $name, $content ) );
+                        $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 ) );
+                        $phpmailer->addCustomHeader( sprintf( "Content-Type: %s;\n\t boundary=\"%s\"", $content_type, $boundary ) );
         }
 
@@ -461 +461 @@
                 foreach ( $attachments as $attachment ) {
                         try {
-                                $phpmailer->AddAttachment($attachment);
+                                $phpmailer->addAttachment($attachment);
                         } catch ( phpmailerException $e ) {
                                 continue;