sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update PHPMailer to 5.2.7 from 5.2.4. 

Includes two trivial modifications for WordPress:
 * Doesn't use the autoloader, so the check to enforce the autoloader from the constructor is removed.
 * Requires class-smtp.php for backwards compatibility with direct (non-wp_mail()) uses of PHPMailer, as the autoloader isn't used.

props bpetty.
fixes #25560.


git-svn-id: https://develop.svn.wordpress.org/trunk@27385 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2014-03-03 20:24:31 +00:00
parent ff567294f6
commit eef62a9d0d
3 changed files with 4035 additions and 3654 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5877
src/wp-includes/class-phpmailer.php
View File

File diff suppressed because it is too large Load Diff

1804
src/wp-includes/class-smtp.php
View File

File diff suppressed because it is too large Load Diff

8
tests/phpunit/includes/mock-mailer.php
View File

@ -4,10 +4,12 @@ require_once( ABSPATH . '/wp-includes/class-phpmailer.php' );
class MockPHPMailer extends PHPMailer {
var $mock_sent = array();
// override the Send function so it doesn't actually send anything
function Send() {
/**
* Override send() so mail isn't actually sent.
*/
function send() {
try {
if ( ! $this->PreSend() )
if ( ! $this->preSend() )
return false;
$this->mock_sent[] = array(