Changeset 13409

Timestamp:

02/03/2023 08:19:48 PM (21 months ago)

Author:

imath

Message:

Prevent a Members single view header action button filters wrong use

Some custom code/plugins might wrongly use something else than an array
(eg: false) to disable one of the action buttons shown inside the single
Members view header. Changes made during the 11.0.0 release revealed this
potential issue.

See #7126
See #8800 (Trunk)

Location:

trunk/src

Files:

• bp-activity/bp-activity-template.php (modified) (1 diff)
• bp-blogs/bp-blogs-template.php (modified) (1 diff)
• bp-friends/bp-friends-template.php (modified) (1 diff)
• bp-groups/bp-groups-template.php (modified) (1 diff)
• bp-messages/bp-messages-template.php (modified) (1 diff)
• bp-templates/bp-nouveau/includes/blogs/template-tags.php (modified) (2 diffs)
• bp-templates/bp-nouveau/includes/members/template-tags.php (modified) (3 diffs)

trunk/src/bp-activity/bp-activity-template.php

@@ -3559 +3559 @@
          * @param array $button_args Array of arguments for the public message button HTML.
          */
-        return apply_filters( 'bp_get_send_public_message_button', $button_args );
+        return (array) apply_filters( 'bp_get_send_public_message_button', $button_args );
     }
 

trunk/src/bp-blogs/bp-blogs-template.php

@@ -1595 +1595 @@
          * @param array $button_args Array of arguments to be used for the button to visit a blog.
          */
-        return apply_filters( 'bp_get_blogs_visit_blog_button', $button_args );
+        return (array) apply_filters( 'bp_get_blogs_visit_blog_button', $button_args );
     }
 

trunk/src/bp-friends/bp-friends-template.php

@@ -458 +458 @@
          * @since 1.1.0
          *
-         * @param string $button_args Button arguments for add friend button.
-         */
-        return apply_filters( 'bp_get_add_friend_button', $button_args );
+         * @param array $button_args Button arguments for add friend button.
+         */
+        return (array) apply_filters( 'bp_get_add_friend_button', $button_args );
     }
 

trunk/src/bp-groups/bp-groups-template.php

@@ -3700 +3700 @@
          * @param object $group       BuddyPress group object
          */
-        return apply_filters( 'bp_get_group_join_button', $button_args, $group );
+        return (array) apply_filters( 'bp_get_group_join_button', $button_args, $group );
     }
     /**

trunk/src/bp-messages/bp-messages-template.php

@@ -1557 +1557 @@
          * @param array $button_args See {@link BP_Button}.
          */
-        return apply_filters( 'bp_get_send_message_button_args', $button_args );
+        return (array) apply_filters( 'bp_get_send_message_button_args', $button_args );
     }
 

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

@@ -200 +200 @@
         }
 
-        $button_args = bp_get_blogs_visit_blog_button_args();
-
         // If we pass through parent classes add them to $button array
         $parent_class = '';
@@ -208 +206 @@
         }
 
-        // Set defaults if not set.
-        $button_args = array_merge( array(
-            'wrapper_id' => '',
-            'link_id'    => '',
-            'link_rel'   => ''
-        ), $button_args );
-
-        $buttons['visit_blog'] = array(
-            'id'                => 'visit_blog',
-            '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(
-                'href'             => $button_args['link_href'],
-                'id'               => $button_args['link_id'],
-                'class'            => $button_args['link_class'] . ' button',
-                'rel'              => $button_args['link_rel'],
-                'title'            => '',
-            ),
-        );
+        $button_args = bp_get_blogs_visit_blog_button_args();
+        if ( array_filter( $button_args ) ) {
+            // Set defaults if not set.
+            $button_args = array_merge( array(
+                'wrapper_id' => '',
+                'link_id'    => '',
+                'link_rel'   => ''
+            ), $button_args );
+
+            $buttons['visit_blog'] = array(
+                'id'                => 'visit_blog',
+                '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(
+                    'href'             => $button_args['link_href'],
+                    'id'               => $button_args['link_id'],
+                    'class'            => $button_args['link_class'] . ' button',
+                    'rel'              => $button_args['link_rel'],
+                    'title'            => '',
+                ),
+            );
+        }
 
         /**

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

@@ -322 +322 @@
                 $button_args = bp_get_add_friend_button_args( $user_id );
 
-                if ( $button_args ) {
+                if ( array_filter( $button_args ) ) {
                     $buttons['member_friendship'] = array(
                         'id'                => 'member_friendship',
@@ -361 +361 @@
                 $button_args = bp_activity_get_public_message_button_args();
 
-                /*
-                 * This button should remain as an anchor link.
-                 * Hardcode the use of anchor elements if button arg passed in for other elements.
-                 */
-                $buttons['public_message'] = array(
-                    'id'                => $button_args['id'],
-                    'position'          => 15,
-                    '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'    => 'a',
-                    '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(
-                        'href'             => $button_args['link_href'],
-                        'id'               => '',
-                        'class'            => $button_args['link_class'],
-                    ),
-                );
+                if ( array_filter( $button_args ) ) {
+                    /*
+                    * This button should remain as an anchor link.
+                    * Hardcode the use of anchor elements if button arg passed in for other elements.
+                    */
+                    $buttons['public_message'] = array(
+                        'id'                => $button_args['id'],
+                        'position'          => 15,
+                        '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'    => 'a',
+                        '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(
+                            'href'             => $button_args['link_href'],
+                            'id'               => '',
+                            'class'            => $button_args['link_class'],
+                        ),
+                    );
+                }
             }
 
@@ -390 +392 @@
                 $button_args = bp_get_send_message_button_args();
 
-                /*
-                 * This button should remain as an anchor link.
-                 * Hardcode the use of anchor elements if button arg passed in for other elements.
-                 */
-                $buttons['private_message'] = array(
-                    'id'                => $button_args['id'],
-                    'position'          => 25,
-                    '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'    => 'a',
-                    '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(
-                        'href'  => bp_get_send_private_message_link(),
-                        'id'    => false,
-                        'class' => $button_args['link_class'],
-                        'rel'   => '',
-                        'title' => '',
-                    ),
-                );
+                if ( array_filter( $button_args ) ) {
+                    /*
+                    * This button should remain as an anchor link.
+                    * Hardcode the use of anchor elements if button arg passed in for other elements.
+                    */
+                    $buttons['private_message'] = array(
+                        'id'                => $button_args['id'],
+                        'position'          => 25,
+                        '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'    => 'a',
+                        '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(
+                            'href'  => bp_get_send_private_message_link(),
+                            'id'    => false,
+                            'class' => $button_args['link_class'],
+                            'rel'   => '',
+                            'title' => '',
+                        ),
+                    );
+                }
             }
         }