Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-22 17:18:32 +01:00
Code Issues Projects Releases Wiki Activity

External Libraries: Add class aliases for phpmailerException and SMTP to deprecated files to account for the new namespace.

Browse Source 
This ensures backward compatibility with plugins using the old `class-phpmailer.php` or `class-smtp.php` files.

Follow-up to [48033].

Props Otto42.
Fixes #50379. See #41750.
Built from https://develop.svn.wordpress.org/trunk@48035


git-svn-id: http://core.svn.wordpress.org/trunk@47802 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2020-06-12 21:42:09 +00:00
parent afaeaf1529
commit aa5017ebb9
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,8 +4,16 @@
* The PHPMailer class has been moved to the wp-includes/PHPMailer subdirectory and now uses the PHPMailer\PHPMailer namespace. * The PHPMailer class has been moved to the wp-includes/PHPMailer subdirectory and now uses the PHPMailer\PHPMailer namespace.
*/ */
if ( function_exists( '_deprecated_file' ) ) { if ( function_exists( '_deprecated_file' ) ) {
_deprecated_file( basename( __FILE__ ), '5.5.0', WPINC . '/PHPMailer/PHPMailer.php', __( 'The PHPMailer class has been moved to wp-includes/PHPMailer subdirectory and now uses the PHPMailer\PHPMailer namespace.' ) ); _deprecated_file(
basename( __FILE__ ),
'5.5.0',
WPINC . '/PHPMailer/PHPMailer.php',
__( 'The PHPMailer class has been moved to wp-includes/PHPMailer subdirectory and now uses the PHPMailer\PHPMailer namespace.' )
);
} }
require __DIR__ . '/PHPMailer/PHPMailer.php'; require __DIR__ . '/PHPMailer/PHPMailer.php';
require __DIR__ . '/PHPMailer/Exception.php';
class_alias( PHPMailer\PHPMailer\PHPMailer::class, 'PHPMailer' ); class_alias( PHPMailer\PHPMailer\PHPMailer::class, 'PHPMailer' );
class_alias( PHPMailer\PHPMailer\Exception::class, 'phpmailerException' );

10
wp-includes/class-smtp.php
View File

@ -3,5 +3,13 @@
/** /**
* The SMTP class has been moved to the wp-includes/PHPMailer subdirectory and now uses the PHPMailer\PHPMailer namespace. * The SMTP class has been moved to the wp-includes/PHPMailer subdirectory and now uses the PHPMailer\PHPMailer namespace.
*/ */
_deprecated_file( basename( __FILE__ ), '5.5.0', WPINC . '/PHPMailer/SMTP.php', __( 'The SMTP class has been moved to the wp-includes/PHPMailer subdirectory and now uses the PHPMailer\PHPMailer namespace.' ) ); _deprecated_file(
basename( __FILE__ ),
'5.5.0',
WPINC . '/PHPMailer/SMTP.php',
__( 'The SMTP class has been moved to the wp-includes/PHPMailer subdirectory and now uses the PHPMailer\PHPMailer namespace.' )
);
require __DIR__ . '/PHPMailer/SMTP.php'; require __DIR__ . '/PHPMailer/SMTP.php';
class_alias( PHPMailer\PHPMailer\SMTP::class, 'SMTP' );

2
wp-includes/version.php
View File

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