<!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][13302] trunk/src: Introduce a function to only get the "Join/Leave Group" button args</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/13302">13302</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/13302","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>2022-07-22 11:44:14 +0000 (Fri, 22 Jul 2022)</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'>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 <a href="http://buddypress.trac.wordpress.org/ticket/7126">#7126</a>
See <a href="http://buddypress.trac.wordpress.org/ticket/8722">#8722</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcoredeprecated110php">trunk/src/bp-core/deprecated/11.0.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesgroupsfunctionsphp">trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php</a></li>
<li><a href="#trunksrcbptemplatesbpnouveauincludesgroupstemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcoredeprecated110php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-core/deprecated/11.0.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-core/deprecated/11.0.php 2022-07-22 10:50:40 UTC (rev 13301)
+++ trunk/src/bp-core/deprecated/11.0.php 2022-07-22 11:44:14 UTC (rev 13302)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -33,3 +33,26 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // return an empty array to stop the button creation process
</span><span class="cx" style="display: block; padding: 0 10px"> return array();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Catch the arguments for buttons
+ *
+ * @since 3.0.0
+ * @deprecated 11.0.0
+ *
+ * @param array $button The arguments of the button that BuddyPress is about to create.
+ *
+ * @return array An empty array to stop the button creation process.
+ */
+function bp_nouveau_groups_catch_button_args( $button = array() ) {
+ _deprecated_function( __FUNCTION__, '11.0.0' );
+
+ /**
+ * Globalize the arguments so that we can use it
+ * in bp_nouveau_get_groups_buttons().
+ */
+ bp_nouveau()->groups->button_args = $button;
+
+ // return an empty array to stop the button creation process
+ return array();
+}
</ins></span></pre></div>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-groups/bp-groups-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-groups/bp-groups-template.php 2022-07-22 10:50:40 UTC (rev 13301)
+++ trunk/src/bp-groups/bp-groups-template.php 2022-07-22 11:44:14 UTC (rev 13302)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3563,30 +3563,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function bp_group_join_button( $group = false ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo bp_get_group_join_button( $group );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</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 button to join a group.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get the arguments for the Join button group
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 1.0.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 11.0.0
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param object|bool $group Single group object.
- * @return false|string
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param BP_Groups_Group $group The group object.
+ * @return Array The arguments for the Join button group
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- function bp_get_group_join_button( $group = false ) {
- global $groups_template;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ function bp_groups_get_group_join_button_args( $group = null ) {
+ $button_args = array();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Set group to current loop group if none passed.
- if ( empty( $group ) ) {
- $group =& $groups_template->group;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $group->id ) ) {
+ return $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"> // Don't show button if not logged in or previously banned.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_user_logged_in() || bp_group_is_user_banned( $group ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $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"> // Group creation was not completed or status is unknown.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $group->status ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $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"> // Already a member.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3595,11 +3595,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Stop sole admins from abandoning their group.
</span><span class="cx" style="display: block; padding: 0 10px"> $group_admins = groups_get_group_admins( $group->id );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ( 1 == count( $group_admins ) ) && ( bp_loggedin_user_id() === (int) $group_admins[0]->user_id ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $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"> // Setup button attributes.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $button = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $button_args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'leave_group',
</span><span class="cx" style="display: block; padding: 0 10px"> 'component' => 'groups',
</span><span class="cx" style="display: block; padding: 0 10px"> 'must_be_logged_in' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3608,6 +3608,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wrapper_id' => 'groupbutton-' . $group->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_href' => wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'leave-group' ), 'groups_leave_group' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_text' => __( 'Leave Group', 'buddypress' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_title' => __( 'Leave Group', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'link_class' => 'group-button leave-group',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3617,10 +3618,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Show different buttons based on group status.
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( $group->status ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'hidden' :
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return false;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $button_args;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'public':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $button = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $button_args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'join_group',
</span><span class="cx" style="display: block; padding: 0 10px"> 'component' => 'groups',
</span><span class="cx" style="display: block; padding: 0 10px"> 'must_be_logged_in' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3629,6 +3630,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wrapper_id' => 'groupbutton-' . $group->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_href' => wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'join' ), 'groups_join_group' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_text' => __( 'Join Group', 'buddypress' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_title' => __( 'Join Group', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'link_class' => 'group-button join-group',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3638,7 +3640,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Member has outstanding invitation -
</span><span class="cx" style="display: block; padding: 0 10px"> // show an "Accept Invitation" button.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $group->is_invited ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $button = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $button_args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'accept_invite',
</span><span class="cx" style="display: block; padding: 0 10px"> 'component' => 'groups',
</span><span class="cx" style="display: block; padding: 0 10px"> 'must_be_logged_in' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3647,6 +3649,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wrapper_id' => 'groupbutton-' . $group->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_href' => add_query_arg( 'redirect_to', bp_get_group_permalink( $group ), bp_get_group_accept_invite_link( $group ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_text' => __( 'Accept Invitation', 'buddypress' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_title' => __( 'Accept Invitation', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'link_class' => 'group-button accept-invite',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3653,7 +3656,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Member has requested membership but request is pending -
</span><span class="cx" style="display: block; padding: 0 10px"> // show a "Request Sent" button.
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $group->is_pending ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $button = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $button_args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'membership_requested',
</span><span class="cx" style="display: block; padding: 0 10px"> 'component' => 'groups',
</span><span class="cx" style="display: block; padding: 0 10px"> 'must_be_logged_in' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3662,6 +3665,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wrapper_id' => 'groupbutton-' . $group->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_href' => bp_get_group_permalink( $group ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_text' => __( 'Request Sent', 'buddypress' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_title' => __( 'Request Sent', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'link_class' => 'group-button pending membership-requested',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3668,7 +3672,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Member has not requested membership yet -
</span><span class="cx" style="display: block; padding: 0 10px"> // show a "Request Membership" button.
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $button = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $button_args = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'request_membership',
</span><span class="cx" style="display: block; padding: 0 10px"> 'component' => 'groups',
</span><span class="cx" style="display: block; padding: 0 10px"> 'must_be_logged_in' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3677,6 +3681,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'wrapper_id' => 'groupbutton-' . $group->id,
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_href' => wp_nonce_url( trailingslashit( bp_get_group_permalink( $group ) . 'request-membership' ), 'groups_request_membership' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_text' => __( 'Request Membership', 'buddypress' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_title' => __( 'Request Membership', 'buddypress' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'link_class' => 'group-button request-membership',
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3686,17 +3691,42 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Filters the HTML button for joining a group.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filters the arguments of the button for joining a group.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.6
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.4.0 Added $group parameter to filter 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">- * @param string $button HTML button for joining a group.
- * @param object $group BuddyPress group object
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $button_args The arguments for the button.
+ * @param object $group BuddyPress group object
</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 bp_get_button( apply_filters( 'bp_get_group_join_button', $button, $group ) );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return apply_filters( 'bp_get_group_join_button', $button_args, $group );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * Return button to join a group.
+ *
+ * @since 1.0.0
+ * @since 11.0.0 uses `bp_groups_get_group_join_button_args()`.
+ *
+ * @param object|bool $group Single group object.
+ * @return false|string
+ */
+ function bp_get_group_join_button( $group = false ) {
+ global $groups_template;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Set group to current loop group if none passed.
+ if ( empty( $group ) ) {
+ $group =& $groups_template->group;
+ }
+
+ $button_args = bp_groups_get_group_join_button_args( $group );
+
+ if ( ! array_filter( $button_args ) ) {
+ return false;
+ }
+
+ return bp_get_button( $button_args );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Output the Create a Group button.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesgroupsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php 2022-07-22 10:50:40 UTC (rev 13301)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/functions.php 2022-07-22 11:44:14 UTC (rev 13302)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -660,26 +660,6 @@
</span><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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Catch the arguments for buttons
- *
- * @since 3.0.0
- *
- * @param array $button The arguments of the button that BuddyPress is about to create.
- *
- * @return array An empty array to stop the button creation process.
- */
-function bp_nouveau_groups_catch_button_args( $button = array() ) {
- /**
- * Globalize the arguments so that we can use it
- * in bp_nouveau_get_groups_buttons().
- */
- bp_nouveau()->groups->button_args = $button;
-
- // return an empty array to stop the button creation process
- return array();
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Catch the content hooked to the 'bp_group_header_meta' action
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.0.0
</span></span></pre></div>
<a id="trunksrcbptemplatesbpnouveauincludesgroupstemplatetagsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php 2022-07-22 10:50:40 UTC (rev 13301)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php 2022-07-22 11:44:14 UTC (rev 13302)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -996,54 +996,41 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Membership button on groups loop or single group's header
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /*
- * 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 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $button_args = bp_groups_get_group_join_button_args( $group );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- bp_get_group_join_button( $group );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If we pass through parent classes merge those into the existing ones
+ if ( $parent_class ) {
+ $parent_class .= ' ' . $button_args['wrapper_class'];
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_filter( 'bp_get_group_join_button', 'bp_nouveau_groups_catch_button_args', 100, 1 );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 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';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( isset( bp_nouveau()->groups->button_args ) && bp_nouveau()->groups->button_args ) {
- $button_args = bp_nouveau()->groups->button_args;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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' => '',
+ ),
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // 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' => '',
- ),
- );
-
</del><span class="cx" style="display: block; padding: 0 10px"> // If button element set add nonce 'href' link to data-attr attr.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'button' === $button_element ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $buttons['group_membership']['button_attr']['data-bp-nonce'] = $button_args['link_href'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1051,9 +1038,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Else this is an anchor so use an 'href' attr.
</span><span class="cx" style="display: block; padding: 0 10px"> $buttons['group_membership']['button_attr']['href'] = $button_args['link_href'];
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
- unset( bp_nouveau()->groups->button_args );
- }
</del><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>