Changeset 13302 for trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php

Timestamp:

07/22/2022 11:44:14 AM (4 years ago)

Author:

imath

Message:

Introduce a function to only get the "Join/Leave Group" button args

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

Props hnla

See #7126
See #8722

File:

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

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

@@ -997 +997 @@
                 // Membership button on groups loop or single group's header
                 } else {
-                        /*
-                         * This filter workaround is waiting for a core adaptation
-                         * so that we can directly get the groups button arguments
-                         * instead of the button.
-                         *
-                         * See https://buddypress.trac.wordpress.org/ticket/7126
-                         */
-                        add_filter( 'bp_get_group_join_button', 'bp_nouveau_groups_catch_button_args', 100, 1 );
-
-                        bp_get_group_join_button( $group );
-
-                        remove_filter( 'bp_get_group_join_button', 'bp_nouveau_groups_catch_button_args', 100, 1 );
-
-                        if ( isset( bp_nouveau()->groups->button_args ) && bp_nouveau()->groups->button_args ) {
-                                $button_args = bp_nouveau()->groups->button_args;
-
-                                // If we pass through parent classes merge those into the existing ones
-                                if ( $parent_class ) {
-                                        $parent_class .= ' ' . $button_args['wrapper_class'];
-                                }
-
-                                // The join or leave group header button should default to 'button'
-                                // Reverse the earler button var to set default as 'button' not 'a'
-                                if ( empty( $args['button_element'] ) ) {
-                                        $button_element = 'button';
-                                }
-
-                                $buttons['group_membership'] = array(
-                                        'id'                => 'group_membership',
-                                        'position'          => 5,
-                                        'component'         => $button_args['component'],
-                                        'must_be_logged_in' => $button_args['must_be_logged_in'],
-                                        'block_self'        => $button_args['block_self'],
-                                        'parent_element'    => $parent_element,
-                                        'button_element'    => $button_element,
-                                        'link_text'         => $button_args['link_text'],
-                                        'parent_attr'       => array(
-                                                        'id'    => $button_args['wrapper_id'],
-                                                        'class' => $parent_class,
-                                        ),
-                                        'button_attr'       => array(
-                                                'id'    => ! empty( $button_args['link_id'] ) ? $button_args['link_id'] : '',
-                                                'class' => $button_args['link_class'] . ' button',
-                                                'rel'   => ! empty( $button_args['link_rel'] ) ? $button_args['link_rel'] : '',
-                                                'title' => '',
-                                        ),
-                                );
+                        $button_args = bp_groups_get_group_join_button_args( $group );
+
+                        // If we pass through parent classes merge those into the existing ones
+                        if ( $parent_class ) {
+                                $parent_class .= ' ' . $button_args['wrapper_class'];
+                        }
+
+                        // The join or leave group header button should default to 'button'
+                        // Reverse the earler button var to set default as 'button' not 'a'
+                        if ( empty( $args['button_element'] ) ) {
+                                $button_element = 'button';
+                        }
+
+                        $buttons['group_membership'] = array(
+                                'id'                => 'group_membership',
+                                'position'          => 5,
+                                'component'         => $button_args['component'],
+                                'must_be_logged_in' => $button_args['must_be_logged_in'],
+                                'block_self'        => $button_args['block_self'],
+                                'parent_element'    => $parent_element,
+                                'button_element'    => $button_element,
+                                'link_text'         => $button_args['link_text'],
+                                'link_title'        => $button_args['link_title'],
+                                'parent_attr'       => array(
+                                                'id'    => $button_args['wrapper_id'],
+                                                'class' => $parent_class,
+                                ),
+                                'button_attr'       => array(
+                                        'id'    => ! empty( $button_args['link_id'] ) ? $button_args['link_id'] : '',
+                                        'class' => $button_args['link_class'] . ' button',
+                                        'rel'   => ! empty( $button_args['link_rel'] ) ? $button_args['link_rel'] : '',
+                                        'title' => '',
+                                ),
+                        );
 
                         // If button element set add nonce 'href' link to data-attr attr.
@@ -1051 +1038 @@
                         // Else this is an anchor so use an 'href' attr.
                                 $buttons['group_membership']['button_attr']['href'] = $button_args['link_href'];
-                        }
-
-                                unset( bp_nouveau()->groups->button_args );
                         }
                 }