Changeset 10490

Timestamp:

02/01/2016 07:25:42 PM (9 years ago)

Author:

djpaul

Message:

Emails: use local instance of WordPress' PHPMailer class.

Relying on the global is okay, but initialising it (if it is unset) touches a WordPress global which doesn't have a direct API. While this is probably safe today, it may not be reliable in the future. After consideration, especially considering BuddyPress' efforts not to introduce or use globals directly, now we instead create a static instance of the PHPMailer object inside the BP_Email class.

The original approach came from WordPress' wp_mail() which, I assume, once found a situation where the global wasn't set.

For #6592

File:

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

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

@@ -18 +18 @@
 
     /**
-     * Constructor.
-     *
-     * @since 2.5.0
-     */
-    public function __construct() {
-        global $phpmailer;
-
-        // We'll try to use the PHPMailer object that might have been created by WordPress.
-        if ( ! ( $phpmailer instanceof PHPMailer ) ) {
-            require_once ABSPATH . WPINC . '/class-phpmailer.php';
-            require_once ABSPATH . WPINC . '/class-smtp.php';
-            $phpmailer = new PHPMailer( true );
-        }
-    }
-
-    /**
      * Send email(s).
      *
@@ -42 +26 @@
      */
     public function bp_email( BP_Email $email ) {
-        global $phpmailer;
+        static $phpmailer = null;
+
+        if ( $phpmailer === null ) {
+            if ( ! class_exists( 'PHPMailer' ) ) {
+                require_once ABSPATH . WPINC . '/class-phpmailer.php';
+                require_once ABSPATH . WPINC . '/class-smtp.php';
+            }
+
+            $phpmailer = new PHPMailer( true );
+        }
+
 
         /*