Ticket #8347: 8437.patch

src/bp-core/classes/class-bp-phpmailer.php

@@ -44 +44 @@
                  * and is now using version 6.0 of PHPMailer.
                  */
                 if ( file_exists( ABSPATH . WPINC . '/PHPMailer/PHPMailer.php' ) ) {
+                        $phpmailer_is_6_0 = true;
+
                         if ( ! ( $phpmailer instanceof PHPMailer\PHPMailer\PHPMailer ) ) {
                                 if ( ! class_exists( 'PHPMailer\\PHPMailer\\PHPMailer' ) ) {
                                         require_once ABSPATH . WPINC . '/PHPMailer/PHPMailer.php';
@@ -51 +53 @@
                                         require_once ABSPATH . WPINC . '/PHPMailer/Exception.php';
                                 }
 
-                                $phpmailer        = new PHPMailer\PHPMailer\PHPMailer( true );
-                                $phpmailer_is_6_0 = true;
+                                $phpmailer = new PHPMailer\PHPMailer\PHPMailer( true );
                         }
                 } else {
                         if ( ! ( $phpmailer instanceof PHPMailer ) ) {