Changeset 10701

Timestamp:

04/13/2016 10:45:04 PM (9 years ago)

Author:

djpaul

Message:

Emails: don't set PHPMailer hostname property

Prior to 2.5.1, this was needed to support multisite. Now that we
support the phpmailer_init action, this isn't needed.

Removing it also fixes a problem where - on some servers - emails were
not being sent if non-multisite WordPress was running from a subfolder.

Fixes #7009 (2.5 branch)

Props singhleo

File:

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

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

@@ -54 +54 @@
 
         $phpmailer->IsMail();
-        $phpmailer->CharSet  = bp_get_option( 'blog_charset' );
-        $phpmailer->Hostname = self::get_hostname();
+        $phpmailer->CharSet = bp_get_option( 'blog_charset' );
 
 
@@ -144 +143 @@
      *
      * @since 2.5.0
+     * @deprecated 2.5.3 No longer used.
      *
      * @return string
      */
     public static function get_hostname() {
-        if ( is_multisite() ) {
-            return get_current_site()->domain;  // From fix_phpmailer_messageid()
-        }
-
-        return preg_replace( '#^https?://#i', '', bp_get_option( 'home' ) );
+        return '';
     }
 }