Skip to:
Content

bbPress.org

Ticket #2162: 2162-2.5-branch.diff

File 2162-2.5-branch.diff, 1.8 KB (added by netweb, 11 years ago)
  • functions.php

     
    10621062        $reply_content = strip_tags( bbp_get_reply_content( $reply_id ) );
    10631063        $reply_url     = bbp_get_reply_url( $reply_id );
    10641064        $blog_name     = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
    1065         $do_not_reply = 'noreply@' . ltrim( get_home_url( null, '', 'relative' ), '/' );
     1065        $do_not_reply = '<noreply@' . ltrim( get_home_url(), '^(http|https)://' ) . '>';
    10661066
    10671067        // For plugins to filter messages per reply/topic/user
    10681068        $message = sprintf( __( '%1$s wrote:
     
    10991099        $headers = array();
    11001100
    11011101        // Setup the From header
    1102         $headers[] = 'From: . ' . get_bloginfo( 'name' ) . ' ' . $do_not_reply;
    1103 
     1102        $headers[] = 'From: ' . get_bloginfo( 'name' ) . ' ' . $do_not_reply;
     1103
    11041104        // Get topic subscribers and bail if empty
    11051105        $user_ids = bbp_get_topic_subscribers( $topic_id, true );
    11061106        if ( empty( $user_ids ) ) {
     
    12021202        $topic_content = strip_tags( bbp_get_topic_content( $topic_id ) );
    12031203        $topic_url     = get_permalink( $topic_id );
    12041204        $blog_name     = wp_specialchars_decode( get_option( 'blogname' ), ENT_QUOTES );
    1205         $do_not_reply  = 'noreply@' . ltrim( get_home_url( null, '', 'relative' ), '/' );
     1205        $do_not_reply = '<noreply@' . ltrim( get_home_url(), '^(http|https)://' ) . '>';
    12061206
    12071207        // For plugins to filter messages per reply/topic/user
    12081208        $message = sprintf( __( '%1$s wrote:
     
    12391239        $headers = array();
    12401240
    12411241        // Setup the From header
    1242         $headers[] = 'From: . ' . get_bloginfo( 'name' ) . ' ' . $do_not_reply;
    1243 
     1242        $headers[] = 'From: ' . get_bloginfo( 'name' ) . ' ' . $do_not_reply;
     1243
    12441244        // Get topic subscribers and bail if empty
    12451245        $user_ids = bbp_get_forum_subscribers( $forum_id, true );
    12461246        if ( empty( $user_ids ) ) {