Skip to:
Content

bbPress.org

Changeset 6327


Ignore:
Timestamp:
02/26/2017 08:52:38 PM (8 years ago)
Author:
johnjamesjacoby
Message:

Engagements/BuddyPress: Add @since for changes in 2.6.0, and a bit more clean-up.

See #3068.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/includes/extend/buddypress/members.php

    r6326 r6327  
    1616 *
    1717 * @since 2.2.0 bbPress (r4395)
     18 * @since 2.6.0 bbPress (r6320) Add engagements support
    1819 *
    1920 * @package bbPress
    … …  
    6364     *
    6465     * @since 2.2.0 bbPress (r4395)
     66     * @since 2.6.0 bbPress (r6320) Add engagements support
    6567     *
    6668     * @access private
    … …  
    8183     *
    8284     * @since 2.0.0 bbPress (r3401)
     85     * @since 2.6.0 bbPress (r6320) Add engagements support
    8386     *
    8487     * @param string $url
    … …  
    97100        $profile_url    = '';
    98101        $component_slug = bbpress()->extend->buddypress->slug;
     102        $profile_url    = bp_core_get_user_domain( $user_id );
    99103
    100104        // Special handling for forum component
    … …  
    102106
    103107            // Empty action or 'topics' action
    104             if ( !bp_current_action() || bp_is_current_action( bbp_get_topic_archive_slug() ) ) {
    105                 $profile_url = bp_core_get_user_domain( $user_id ) . $component_slug . '/' . bbp_get_topic_archive_slug();
     108            if ( ! bp_current_action() || bp_is_current_action( bbp_get_topic_archive_slug() ) ) {
     109                $profile_url = $profile_url . $component_slug . '/' . bbp_get_topic_archive_slug();
    106110
    107111            // Empty action or 'topics' action
    108112            } elseif ( bp_is_current_action( bbp_get_reply_archive_slug() ) ) {
    109                 $profile_url = bp_core_get_user_domain( $user_id ) . $component_slug . '/' . bbp_get_reply_archive_slug();
     113                $profile_url = $profile_url . $component_slug . '/' . bbp_get_reply_archive_slug();
    110114
    111115            // 'favorites' action
    … …  
    119123            // 'engagements' action
    120124            } elseif ( bbp_is_engagements_active() && bp_is_current_action( bbp_get_user_engagements_slug() ) ) {
    121                 $profile_url = $this->get_subscriptions_permalink( '', $user_id );
     125                $profile_url = $this->get_engagements_permalink( $user_id );
    122126            }
    123 
    124         // Not in users' forums area
    125         } else {
    126             $profile_url = bp_core_get_user_domain( $user_id );
    127127        }
    128128
    … …  
    148148        $component_slug = bbpress()->extend->buddypress->slug;
    149149        $url            = trailingslashit( bp_core_get_user_domain( $user_id ) . $component_slug . '/' . bbp_get_user_favorites_slug() );
     150
    150151        return $url;
    151152    }
    … …  
    169170        $component_slug = bbpress()->extend->buddypress->slug;
    170171        $url            = trailingslashit( bp_core_get_user_domain( $user_id ) . $component_slug . '/' . bbp_get_user_subscriptions_slug() );
     172
    171173        return $url;
    172174    }
    … …  
    190192        $component_slug = bbpress()->extend->buddypress->slug;
    191193        $url            = trailingslashit( bp_core_get_user_domain( $user_id ) . $component_slug . '/' . bbp_get_user_engagements_slug() );
     194
    192195        return $url;
    193196    }
    … …  
    198201     *
    199202     * @since 2.3.0 bbPress (r4615)
     203     * @since 2.6.0 bbPress (r6320) Add engagements support
    200204     *
    201205     * @global WP_Query $wp_query
Note: See TracChangeset for help on using the changeset viewer.