Changeset 12709

Timestamp:

08/29/2020 09:35:31 AM (4 years ago)

Author:

imath

Message:

Use the right PHPMailer version even if default mailer is overridden

Props r-a-y, dcavins

Fixes #8347 (Branch 6.0)

File:

• branches/6.0/src/bp-core/classes/class-bp-phpmailer.php (modified) (2 diffs)

branches/6.0/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' ) ) {
+        if ( bp_get_major_wp_version() >= 5.5 ) {
+            $phpmailer_is_6_0 = true;
+
             if ( ! ( $phpmailer instanceof PHPMailer\PHPMailer\PHPMailer ) ) {
                 if ( ! class_exists( 'PHPMailer\\PHPMailer\\PHPMailer' ) ) {
@@ -52 +54 @@
                 }
 
-                $phpmailer        = new PHPMailer\PHPMailer\PHPMailer( true );
-                $phpmailer_is_6_0 = true;
+                $phpmailer = new PHPMailer\PHPMailer\PHPMailer( true );
             }
         } else {