Skip to:
Content

BuddyPress.org

Changeset 7482


Ignore:
Timestamp:
10/28/2013 08:31:48 PM (12 years ago)
Author:
r-a-y
Message:

Remove activity comment count check in activity entry template.

Due to changes in r6410 to expand how activity comments are fetched, a
comment count now existed for nested activity comments.

Because the comment count now exists for nested activity comments, this had
the unintended consequence of showing activity comments on singular
activity comment entries. Since the current javascript / AJAX code is
unable to determine the parent activity ID correctly on a singular
activity comment item, this would result in the "View Conversation" link
being incorrect for replies that were made to these items.

This commit resolves this issue by removing the activity comment count
check, which will not output the activity comment form for singular
activity comment entries.

Fixes #5172.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/bp-templates/bp-legacy/buddypress/activity/entry.php

    r6915 r7482  
    8686    <?php do_action( 'bp_before_activity_entry_comments' ); ?>
    8787
    88     <?php if ( ( is_user_logged_in() && bp_activity_can_comment() ) || bp_activity_get_comment_count() ) : ?>
     88    <?php if ( is_user_logged_in() && bp_activity_can_comment() ) : ?>
    8989
    9090        <div class="activity-comments">

  • trunk/bp-themes/bp-default/activity/entry.php

    r6522 r7482  
    8888    <?php do_action( 'bp_before_activity_entry_comments' ); ?>
    8989
    90     <?php if ( ( is_user_logged_in() && bp_activity_can_comment() ) || bp_activity_get_comment_count() ) : ?>
     90    <?php if ( is_user_logged_in() && bp_activity_can_comment() ) : ?>
    9191
    9292        <div class="activity-comments">
Note: See TracChangeset for help on using the changeset viewer.