diff --git src/bp-core/bp-core-functions.php src/bp-core/bp-core-functions.php index 592f5b155..3563f5f5a 100644 --- src/bp-core/bp-core-functions.php +++ src/bp-core/bp-core-functions.php @@ -949,6 +949,54 @@ function bp_core_get_component_search_query_arg( $component = null ) { return apply_filters( 'bp_core_get_component_search_query_arg', $query_arg, $component ); } +/** + * Get a list of all active component objects. + * + * @since 8.0.0 + * + * @param array $args { + * Optional. An array of key => value arguments to match against the component objects. + * Default empty array. + * + * @type string $name Translatable name for the component. + * @type string $id Unique ID for the component. + * @type string $slug Unique slug for the component, for use in query strings and URLs. + * @type bool $has_directory True if the component has a top-level directory. False otherwise. + * @type string $root_slug Slug used by the component's directory page. + * } + * @param string $output Optional. The type of output to return. Accepts 'ids' + * or 'objects'. Default 'ids'. + * @param string $operator Optional. The logical operation to perform. 'or' means only one + * element from the array needs to match; 'and' means all elements + * must match. Accepts 'or' or 'and'. Default 'and'. + * @return array A list of component ids or objects. + */ +function bp_core_get_active_components( $args = array(), $output = 'ids', $operator = 'and' ) { + $bp = buddypress(); + + $active_components = array_keys( $bp->active_components ); + + $xprofile_id = array_search( 'xprofile', $active_components, true ); + if ( false !== $xprofile_id ) { + $active_components[ $xprofile_id ] = 'profile'; + } + + $components = array(); + foreach ( $active_components as $id ) { + if ( isset( $bp->{$id} ) && $bp->{$id} instanceof BP_Component ) { + $components[ $id ] = $bp->{$id}; + } + } + + $components = wp_filter_object_list( $components, $args, $operator ); + + if ( 'ids' === $output ) { + $components = wp_list_pluck( $components, 'id' ); + } + + return $components; +} + /** * Determine whether BuddyPress should register the bp-themes directory. * diff --git src/bp-members/bp-members-adminbar.php src/bp-members/bp-members-adminbar.php index 28b6f54c3..10f784d09 100644 --- src/bp-members/bp-members-adminbar.php +++ src/bp-members/bp-members-adminbar.php @@ -102,7 +102,7 @@ function bp_members_admin_bar_user_admin_menu() { 'parent' => $bp->user_admin_menu_id, 'id' => $bp->user_admin_menu_id . '-edit-profile', 'title' => __( "Edit Profile", 'buddypress' ), - 'href' => bp_get_members_component_link( 'profile', 'edit' ) + 'href' => bp_get_members_component_link( $bp->profile->id, 'edit' ) ) ); // User Admin > Edit this user's avatar. @@ -111,7 +111,7 @@ function bp_members_admin_bar_user_admin_menu() { 'parent' => $bp->user_admin_menu_id, 'id' => $bp->user_admin_menu_id . '-change-avatar', 'title' => __( "Edit Profile Photo", 'buddypress' ), - 'href' => bp_get_members_component_link( 'profile', 'change-avatar' ) + 'href' => bp_get_members_component_link( $bp->profile->id, 'change-avatar' ) ) ); } @@ -121,7 +121,7 @@ function bp_members_admin_bar_user_admin_menu() { 'parent' => $bp->user_admin_menu_id, 'id' => $bp->user_admin_menu_id . '-change-cover-image', 'title' => __( 'Edit Cover Image', 'buddypress' ), - 'href' => bp_get_members_component_link( 'profile', 'change-cover-image' ) + 'href' => bp_get_members_component_link( $bp->profile->id, 'change-cover-image' ) ) ); } diff --git src/bp-members/bp-members-template.php src/bp-members/bp-members-template.php index 5ceda3078..541b27479 100644 --- src/bp-members/bp-members-template.php +++ src/bp-members/bp-members-template.php @@ -2800,35 +2800,43 @@ function bp_members_component_link( $component, $action = '', $query_args = '', * @return string */ function bp_get_members_component_link( $component, $action = '', $query_args = '', $nonce = false ) { - // Must be displayed user. - if ( !bp_displayed_user_id() ) + if ( ! bp_displayed_user_id() ) { return; + } $bp = buddypress(); + if ( 'xprofile' === $component ) { + $component = 'profile'; + } + // Append $action to $url if there is no $type. - if ( !empty( $action ) ) + if ( ! empty( $action ) ) { $url = bp_displayed_user_domain() . $bp->{$component}->slug . '/' . $action; - else + } else { $url = bp_displayed_user_domain() . $bp->{$component}->slug; + } // Add a slash at the end of our user url. $url = trailingslashit( $url ); // Add possible query arg. - if ( !empty( $query_args ) && is_array( $query_args ) ) + if ( ! empty( $query_args ) && is_array( $query_args ) ) { $url = add_query_arg( $query_args, $url ); + } // To nonce, or not to nonce... - if ( true === $nonce ) + if ( true === $nonce ) { $url = wp_nonce_url( $url ); - elseif ( is_string( $nonce ) ) + } elseif ( is_string( $nonce ) ) { $url = wp_nonce_url( $url, $nonce ); + } // Return the url, if there is one. - if ( !empty( $url ) ) + if ( ! empty( $url ) ) { return $url; + } } diff --git src/bp-members/classes/class-bp-members-component.php src/bp-members/classes/class-bp-members-component.php index 77777d645..9e6fbcd42 100644 --- src/bp-members/classes/class-bp-members-component.php +++ src/bp-members/classes/class-bp-members-component.php @@ -314,7 +314,7 @@ class BP_Members_Component extends BP_Component { $access = bp_core_can_edit_settings(); $slug = bp_get_profile_slug(); - $profile_link = bp_get_members_component_link( $slug ); + $profile_link = bp_get_members_component_link( buddypress()->profile->id ); // Change Avatar. if ( buddypress()->avatar->show_avatars ) { diff --git src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php index 20441b2f3..d07d70cfb 100644 --- src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php +++ src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php @@ -3,26 +3,26 @@ * BP Nouveau Search & filters bar * * @since 3.0.0 - * @version 3.1.0 + * @version 8.0.0 */ ?>