Skip to:
Content

bbPress.org

Changeset 5391


Ignore:
Timestamp:
06/12/2014 03:04:39 AM (5 years ago)
Author:
johnjamesjacoby
Message:

Pass $reply_id into calls to bbp_validate_reply_to() and remove reply_query references in BBP_Walker_Reply_Dropdown. Fixes invalid bbp_reply_id value output in form-reply.php. See #2617.

Location:
trunk/src/includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/includes/common/classes.php

    r5389 r5391  
    501501        // Set up reply
    502502        $depth++;
    503         bbpress()->reply_query->reply_depth = (int) $depth;
    504         bbpress()->reply_query->post        = $object;
    505         bbpress()->current_reply_id         = $object->ID;
    506503
    507504        // Get reply ancestors
  • trunk/src/includes/replies/functions.php

    r5390 r5391  
    496496    // Define local variable(s)
    497497    $revisions_removed = false;
    498     $reply = $reply_id = $reply_author = $topic_id = $forum_id = $anonymous_data = 0;
     498    $reply = $reply_id = $reply_to = $reply_author = $topic_id = $forum_id = $anonymous_data = 0;
    499499    $reply_title = $reply_content = $reply_edit_reason = $terms = '';
    500500
     
    635635    // Handle Reply To of the reply; $_REQUEST for non-JS submissions
    636636    if ( isset( $_REQUEST['bbp_reply_to'] ) ) {
    637         $reply_to = bbp_validate_reply_to( $_REQUEST['bbp_reply_to'] );
     637        $reply_to = bbp_validate_reply_to( $_REQUEST['bbp_reply_to'], $reply_id );
    638638    }
    639639
     
    795795    $topic_id = bbp_get_topic_id( $topic_id );
    796796    $forum_id = bbp_get_forum_id( $forum_id );
    797     $reply_to = bbp_validate_reply_to( $reply_to );
     797    $reply_to = bbp_validate_reply_to( $reply_to, $reply_id );
    798798
    799799    // Bail if there is no reply
Note: See TracChangeset for help on using the changeset viewer.