Changeset 5639

Timestamp:

03/17/2015 12:26:37 AM (10 years ago)

Author:

netweb

Message:

Use preg_replace over incorrect ltrim usage in bbp_get_do_not_reply_address() causing undeliverable or invalid subscription emails in certain situations because the "from" address was incorrect.

Props DJPaul. See #2618 (2.5 Branch)

File:

• branches/2.5/includes/common/functions.php (modified) (6 diffs)

branches/2.5/includes/common/functions.php

@@ -993 +993 @@
  * those cases, we recommend unhooking this function and creating your own
  * custom emailer script.
- * 
+ *
  * @since bbPress (r2668)
  *
@@ -1063 +1063 @@
     $reply_url     = bbp_get_reply_url( $reply_id );
     $blog_name     = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-    $do_not_reply  = '<noreply@' . ltrim( get_home_url(), '^(http|https)://' ) . '>';
+    $do_not_reply  = '<noreply@' . preg_replace( '@^https?://(www\.)?@i', '', get_home_url() ) . '>';
 
     // For plugins to filter messages per reply/topic/user
@@ -1101 +1101 @@
     // Setup the From header
     $headers[] = 'From: ' . get_bloginfo( 'name' ) . ' ' . $do_not_reply;
-    
+
     // Get topic subscribers and bail if empty
     $user_ids = bbp_get_topic_subscribers( $topic_id, true );
@@ -1146 +1146 @@
  * those cases, we recommend unhooking this function and creating your own
  * custom emailer script.
- * 
+ *
  * @since bbPress (r5156)
  *
@@ -1203 +1203 @@
     $topic_url     = get_permalink( $topic_id );
     $blog_name     = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
-    $do_not_reply  = '<noreply@' . ltrim( get_home_url(), '^(http|https)://' ) . '>';
+    $do_not_reply  = '<noreply@' . preg_replace( '@^https?://(www\.)?@i', '', get_home_url() ) . '>';
 
     // For plugins to filter messages per reply/topic/user
@@ -1241 +1241 @@
     // Setup the From header
     $headers[] = 'From: ' . get_bloginfo( 'name' ) . ' ' . $do_not_reply;
-    
+
     // Get topic subscribers and bail if empty
     $user_ids = bbp_get_forum_subscribers( $forum_id, true );