Changeset 13410 for branches/11.0/src/bp-templates/bp-nouveau/includes/blogs/template-tags.php

Timestamp:

02/03/2023 08:34:14 PM (22 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
Closes ​https://github.com/buddypress/buddypress/pull/59
Fixes #8800 (branch 11.0)

File:

• branches/11.0/src/bp-templates/bp-nouveau/includes/blogs/template-tags.php (modified) (2 diffs)

branches/11.0/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'            => '',
+                ),
+            );
+        }
 
         /**