<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][13410] branches/11.0/src: Prevent a Members single view header action button filters wrong use</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://buddypress.trac.wordpress.org/changeset/13410">13410</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://buddypress.trac.wordpress.org/changeset/13410","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>imath</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-02-03 20:34:14 +0000 (Fri, 03 Feb 2023)</dd>
</dl>

<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="http://buddypress.trac.wordpress.org/ticket/7126">#7126</a>
Closes https://github.com/buddypress/buddypress/pull/59
Fixes <a href="http://buddypress.trac.wordpress.org/ticket/8800">#8800</a> (branch 11.0)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branches110srcbpactivitybpactivitytemplatephp">branches/11.0/src/bp-activity/bp-activity-template.php</a></li>
<li><a href="#branches110srcbpblogsbpblogstemplatephp">branches/11.0/src/bp-blogs/bp-blogs-template.php</a></li>
<li><a href="#branches110srcbpfriendsbpfriendstemplatephp">branches/11.0/src/bp-friends/bp-friends-template.php</a></li>
<li><a href="#branches110srcbpgroupsbpgroupstemplatephp">branches/11.0/src/bp-groups/bp-groups-template.php</a></li>
<li><a href="#branches110srcbpmessagesbpmessagestemplatephp">branches/11.0/src/bp-messages/bp-messages-template.php</a></li>
<li><a href="#branches110srcbptemplatesbpnouveauincludesblogstemplatetagsphp">branches/11.0/src/bp-templates/bp-nouveau/includes/blogs/template-tags.php</a></li>
<li><a href="#branches110srcbptemplatesbpnouveauincludesmemberstemplatetagsphp">branches/11.0/src/bp-templates/bp-nouveau/includes/members/template-tags.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches110srcbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/11.0/src/bp-activity/bp-activity-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/11.0/src/bp-activity/bp-activity-template.php    2023-02-03 20:19:48 UTC (rev 13409)
+++ branches/11.0/src/bp-activity/bp-activity-template.php      2023-02-03 20:34:14 UTC (rev 13410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3560,7 +3560,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param array $button_args Array of arguments for the public message button HTML.
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return apply_filters( 'bp_get_send_public_message_button', $button_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return (array) apply_filters( 'bp_get_send_public_message_button', $button_args );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span></span></pre></div>
<a id="branches110srcbpblogsbpblogstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/11.0/src/bp-blogs/bp-blogs-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/11.0/src/bp-blogs/bp-blogs-template.php  2023-02-03 20:19:48 UTC (rev 13409)
+++ branches/11.0/src/bp-blogs/bp-blogs-template.php    2023-02-03 20:34:14 UTC (rev 13410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1596,7 +1596,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param array $button_args Array of arguments to be used for the button to visit a blog.
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return apply_filters( 'bp_get_blogs_visit_blog_button', $button_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return (array) apply_filters( 'bp_get_blogs_visit_blog_button', $button_args );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span></span></pre></div>
<a id="branches110srcbpfriendsbpfriendstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/11.0/src/bp-friends/bp-friends-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/11.0/src/bp-friends/bp-friends-template.php      2023-02-03 20:19:48 UTC (rev 13409)
+++ branches/11.0/src/bp-friends/bp-friends-template.php        2023-02-03 20:34:14 UTC (rev 13410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -457,9 +457,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><span class="cx" style="display: block; padding: 0 10px">                 * @since 1.1.0
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                 * @param string $button_args Button arguments for add friend button.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+          * @param array $button_args Button arguments for add friend button.
</ins><span class="cx" style="display: block; padding: 0 10px">                  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return apply_filters( 'bp_get_add_friend_button', $button_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return (array) apply_filters( 'bp_get_add_friend_button', $button_args );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span></span></pre></div>
<a id="branches110srcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/11.0/src/bp-groups/bp-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/11.0/src/bp-groups/bp-groups-template.php        2023-02-03 20:19:48 UTC (rev 13409)
+++ branches/11.0/src/bp-groups/bp-groups-template.php  2023-02-03 20:34:14 UTC (rev 13410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3699,7 +3699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param array  $button_args The arguments for the button.
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param object $group       BuddyPress group object
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return apply_filters( 'bp_get_group_join_button', $button_args, $group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return (array) apply_filters( 'bp_get_group_join_button', $button_args, $group );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span><span class="cx" style="display: block; padding: 0 10px">         * Return button to join a group.
</span></span></pre></div>
<a id="branches110srcbpmessagesbpmessagestemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/11.0/src/bp-messages/bp-messages-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/11.0/src/bp-messages/bp-messages-template.php    2023-02-03 20:19:48 UTC (rev 13409)
+++ branches/11.0/src/bp-messages/bp-messages-template.php      2023-02-03 20:34:14 UTC (rev 13410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1556,7 +1556,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                 *
</span><span class="cx" style="display: block; padding: 0 10px">                 * @param array $button_args See {@link BP_Button}.
</span><span class="cx" style="display: block; padding: 0 10px">                 */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                return apply_filters( 'bp_get_send_message_button_args', $button_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         return (array) apply_filters( 'bp_get_send_message_button_args', $button_args );
</ins><span class="cx" style="display: block; padding: 0 10px">         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        /**
</span></span></pre></div>
<a id="branches110srcbptemplatesbpnouveauincludesblogstemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/11.0/src/bp-templates/bp-nouveau/includes/blogs/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/11.0/src/bp-templates/bp-nouveau/includes/blogs/template-tags.php        2023-02-03 20:19:48 UTC (rev 13409)
+++ branches/11.0/src/bp-templates/bp-nouveau/includes/blogs/template-tags.php  2023-02-03 20:34:14 UTC (rev 13410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,8 +199,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $icons = ' icons';
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $button_args = bp_get_blogs_visit_blog_button_args();
-
</del><span class="cx" style="display: block; padding: 0 10px">                 // If we pass through parent classes add them to $button array
</span><span class="cx" style="display: block; padding: 0 10px">                $parent_class = '';
</span><span class="cx" style="display: block; padding: 0 10px">                if ( ! empty( $args['parent_attr']['class'] ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -207,35 +205,38 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        $parent_class = $args['parent_attr']['class'];
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                // Set defaults if not set.
-               $button_args = array_merge( array(
-                       'wrapper_id' => '',
-                       'link_id'    => '',
-                       'link_rel'   => ''
-               ), $button_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         $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 );
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                $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'            => '',
-                       ),
-               );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                 $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'            => '',
+                               ),
+                       );
+               }
</ins><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                /**
</span><span class="cx" style="display: block; padding: 0 10px">                 * Filter to add your buttons, use the position argument to choose where to insert it.
</span></span></pre></div>
<a id="branches110srcbptemplatesbpnouveauincludesmemberstemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/11.0/src/bp-templates/bp-nouveau/includes/members/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/11.0/src/bp-templates/bp-nouveau/includes/members/template-tags.php      2023-02-03 20:19:48 UTC (rev 13409)
+++ branches/11.0/src/bp-templates/bp-nouveau/includes/members/template-tags.php        2023-02-03 20:34:14 UTC (rev 13410)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -321,7 +321,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        } else {
</span><span class="cx" style="display: block; padding: 0 10px">                                $button_args = bp_get_add_friend_button_args( $user_id );
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                if ( $button_args ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         if ( array_filter( $button_args ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px">                                         $buttons['member_friendship'] = array(
</span><span class="cx" style="display: block; padding: 0 10px">                                                'id'                => 'member_friendship',
</span><span class="cx" style="display: block; padding: 0 10px">                                                'position'          => 5,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,61 +360,65 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( bp_is_active( 'activity' ) && bp_activity_do_mentions() ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $button_args = bp_activity_get_public_message_button_args();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /*
-                                * 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'],
-                                       ),
-                               );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         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'],
+                                               ),
+                                       );
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">                        if ( bp_is_active( 'messages' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">                                $button_args = bp_get_send_message_button_args();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                                /*
-                                * 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' => '',
-                                       ),
-                               );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                         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' => '',
+                                               ),
+                                       );
+                               }
</ins><span class="cx" style="display: block; padding: 0 10px">                         }
</span><span class="cx" style="display: block; padding: 0 10px">                }
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre>
</div>
</div>

</body>
</html>