Skip to:
Content

bbPress.org


Ignore:
Timestamp:
09/15/2011 08:29:56 PM (13 years ago)
Author:
johnjamesjacoby
Message:

Fix issue where subscription emails were not being sent in some circumstances.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/plugin/bbp-includes/bbp-common-functions.php

    r3505 r3515  
    983983 * @return bool True on success, false on failure
    984984 */
    985 function bbp_notify_subscribers( $reply_id = 0 ) {
     985function bbp_notify_subscribers( $reply_id = 0, $topic_id = 0, $forum_id = 0, $anonymous_data = false, $reply_author = 0 ) {
    986986    global $wpdb;
    987987
     
    990990        return false;
    991991
     992    /** Validation ************************************************************/
     993    $reply_id = bbp_get_reply_id( $reply_id );
     994    $topic_id = bbp_get_topic_id( $topic_id );
     995    $forum_id = bbp_get_reply_id( $forum_id );
     996   
    992997    /** Reply *****************************************************************/
    993 
    994     // Validate reply ID and bail if empty
    995     $reply_id = bbp_get_reply_id( $reply_id );
    996     if ( empty( $reply_id ) )
    997         return false;
    998 
    999     // Get the reply and bail if empty
    1000     $reply = bbp_get_reply( $reply_id );
    1001     if ( empty( $reply ) )
    1002         return false;
    1003998
    1004999    // Bail if reply is not published
     
    10081003    /** Topic *****************************************************************/
    10091004
    1010     // Get topic ID and bail if empty
    1011     $topic_id = bbp_get_reply_topic_id( $reply_id );
    1012     if ( empty( $topic_id ) )
     1005    // Bail if topic is not published
     1006    if ( !bbp_is_topic_published( $topic_id ) )
    10131007        return false;
    10141008
    1015     // Get the topic and bail if empty
    1016     $topic = bbp_get_topic( $topic_id );
    1017     if ( empty( $topic ) )
    1018         return false;
    1019 
    1020     // Bail if reply is not published
    1021     if ( !bbp_is_topic_published( $reply_id ) )
    1022         return false;
    1023 
    10241009    /** User ******************************************************************/
    10251010
    1026     // Get  subscribers and bail if empty
     1011    // Get subscribers and bail if empty
    10271012    $user_ids = bbp_get_topic_subscribers( $topic_id, true );
    10281013    if ( empty( $user_ids ) )
    10291014        return false;
    10301015
     1016    // Poster name
     1017    $reply_author_name = bbp_get_reply_author_display_name( $reply_id );
     1018
    10311019    /** Mail ******************************************************************/
    10321020
     
    10371025
    10381026        // Don't send notifications to the person who made the post
    1039         if ( (int) $user_id == (int) $reply->post_author )
     1027        if ( !empty( $reply_author ) && (int) $user_id == (int) $reply_author )
    10401028            continue;
    10411029
    10421030        // For plugins to filter messages per reply/topic/user
    10431031        $message = __( "%1\$s wrote:\n\n%2\$s\n\nPost Link: %3\$s\n\nYou are recieving this email because you subscribed to it. Login and visit the topic to unsubscribe from these emails.", 'bbpress' );
    1044         $message = apply_filters( 'bbp_subscription_mail_message', sprintf( $message, $poster_name, strip_tags( $reply->post_content ), bbp_get_reply_url( $reply_id ) ), $reply_id, $topic_id, $user_id );
     1032        $message = apply_filters( 'bbp_subscription_mail_message', sprintf( $message, $reply_author_name, strip_tags( bbp_get_reply_content( $reply_id ) ), bbp_get_reply_url( $reply_id ) ), $reply_id, $topic_id, $user_id );
    10451033        if ( empty( $message ) )
    10461034            continue;
    10471035
    10481036        // For plugins to filter titles per reply/topic/user
    1049         $subject = apply_filters( 'bbp_subscription_mail_title', '[' . get_option( 'blogname' ) . '] ' . $topic->post_title, $reply_id, $topic_id, $user_id );
     1037        $subject = apply_filters( 'bbp_subscription_mail_title', '[' . get_option( 'blogname' ) . '] ' . bbp_get_topic_title( $topic_id ), $reply_id, $topic_id, $user_id );
    10501038        if ( empty( $subject ) )
    10511039            continue;
Note: See TracChangeset for help on using the changeset viewer.