Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Mail: Make sure the `PHPMailer` class is only required once if a plugin requires `wp-includes/class-phpmailer.php` directly. 

Follow-up to [48033].

Props david.binda.
Fixes #50716. See #41750.
Built from https://develop.svn.wordpress.org/trunk@48530


git-svn-id: http://core.svn.wordpress.org/trunk@48292 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-07-21 12:58:02 +00:00
parent 9ce7bd633b
commit ee60c40806
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/class-phpmailer.php
View File

@ -12,8 +12,8 @@ if ( function_exists( '_deprecated_file' ) ) {
);
}
require __DIR__ . '/PHPMailer/PHPMailer.php';
require __DIR__ . '/PHPMailer/Exception.php';
require_once __DIR__ . '/PHPMailer/PHPMailer.php';
require_once __DIR__ . '/PHPMailer/Exception.php';
class_alias( PHPMailer\PHPMailer\PHPMailer::class, 'PHPMailer' );
class_alias( PHPMailer\PHPMailer\Exception::class, 'phpmailerException' );

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
*
* @global string $wp_version
*/
$wp_version = '5.5-beta2-48529';
$wp_version = '5.5-beta2-48530';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.