Changeset 13301 for trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php

Timestamp:

07/22/2022 10:50:40 AM (4 years ago)

Author:

imath

Message:

Introduce a function to only get the Friendship button arguments

bp_get_add_friend_button_args() eases the process of getting these arguments and removes the need for BP Nouveau's workaround.
Deprecate the bp_nouveau_members_catch_button_args() as no more needed.

Props hnla

See #7126
See #8722

File:

• trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php (modified) (3 diffs)

trunk/src/bp-templates/bp-nouveau/includes/members/template-tags.php

@@ -320 +320 @@
                         // It's any other members screen
                         } else {
-                                /*
-                                 * This filter workaround is waiting for a core adaptation
-                                 * so that we can directly get the friends button arguments
-                                 * instead of the button.
-                                 *
-                                 * See https://buddypress.trac.wordpress.org/ticket/7126
-                                 */
-                                add_filter( 'bp_get_add_friend_button', 'bp_nouveau_members_catch_button_args', 100, 1 );
-
-                                bp_get_add_friend_button( $user_id );
-
-                                remove_filter( 'bp_get_add_friend_button', 'bp_nouveau_members_catch_button_args', 100, 1 );
-
-                                if ( isset( bp_nouveau()->members->button_args ) && bp_nouveau()->members->button_args ) {
-                                        $button_args = bp_nouveau()->members->button_args;
-
+                                $button_args = bp_get_add_friend_button_args( $user_id );
+
+                                if ( $button_args ) {
                                         $buttons['member_friendship'] = array(
                                                 'id'                => 'member_friendship',
@@ -344 +331 @@
                                                 'parent_element'    => $parent_element,
                                                 'link_text'         => $button_args['link_text'],
+                                                'link_title'        => $button_args['link_title'],
                                                 'parent_attr'       => array(
                                                         'id'    => $button_args['wrapper_id'],
@@ -364 +352 @@
                                                 $buttons['member_friendship']['button_attr']['href'] = $button_args['link_href'];
                                         }
-
-                                        unset( bp_nouveau()->members->button_args );
                                 }
                         }