Changeset 11862

Timestamp:

02/21/2018 02:41:41 AM (6 years ago)

Author:

r-a-y

Message:

Emails: Only add the 'List-Unsubscribe' header if we have a valid unsubscribe link.

Previously, we were adding a blank 'List-Unsubscribe' header for activation
and change of email address emails. This caused delivery issues for those
using Outlook.com as their email address. It appears that Outlook.com
requires a valid 'List-Unsubscribe' header in order for the email to be
received.

This commit fixes this by only adding the 'List-Unsubscribe' header if we
have a valid email unsubscribe link.

Props jcrr.

See #7697 (2.9-branch)

File:

• branches/2.9/src/bp-core/bp-core-filters.php (modified) (1 diff)

branches/2.9/src/bp-core/bp-core-filters.php

@@ -1012 +1012 @@
         $user = get_user_by( 'email', $tokens['recipient.email'] );
 
-        $headers['List-Unsubscribe'] = sprintf(
-            '<%s>',
-            esc_url_raw( bp_email_get_unsubscribe_link( array(
-                'user_id'           => $user->ID,
-                'notification_type' => $email->get( 'type' ),
-            ) ) )
-        );
+        $link = bp_email_get_unsubscribe_link( array(
+            'user_id'           => $user->ID,
+            'notification_type' => $email->get( 'type' ),
+        ) );
+
+        if ( ! empty( $link ) ) {
+            $headers['List-Unsubscribe'] = sprintf( '<%s>', esc_url_raw( $link ) );
+        }
     }