Ticket #2618: 2618.5-25branch.diff

branches/2.5/includes/common/functions.php

@@ -1062 +1062 @@
         $reply_content = strip_tags( bbp_get_reply_content( $reply_id ) );
         $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
         $message = sprintf( __( '%1$s wrote:
@@ -1202 +1202 @@
         $topic_content = strip_tags( bbp_get_topic_content( $topic_id ) );
         $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
         $message = sprintf( __( '%1$s wrote: