Changeset 48035

Timestamp:

06/12/2020 09:40:52 PM (5 years ago)

Author:

SergeyBiryukov

Message:

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

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.

Location:

trunk/src/wp-includes

Files:

• class-phpmailer.php (modified) (1 diff)
• class-smtp.php (modified) (1 diff)

trunk/src/wp-includes/class-phpmailer.php

@@ -5 +5 @@
  */
 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/Exception.php';
 
 class_alias( PHPMailer\PHPMailer\PHPMailer::class, 'PHPMailer' );
+class_alias( PHPMailer\PHPMailer\Exception::class, 'phpmailerException' );

trunk/src/wp-includes/class-smtp.php

@@ -4 +4 @@
  * 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';
+
+class_alias( PHPMailer\PHPMailer\SMTP::class, 'SMTP' );