<!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][13310] trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php: Be sure the join/leave group button args exist before trying to use it</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/13310">13310</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/13310","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-08-08 21:46:33 +0000 (Mon, 08 Aug 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'>Be sure the join/leave group button args exist before trying to use it
This is a follow up to <a href="http://buddypress.trac.wordpress.org/changeset/13302">[13302]</a>. When the group creator is displaying the corresponding group's pages, the "join/leave group" header's button is not generated. In <a href="http://buddypress.trac.wordpress.org/changeset/13302">[13302]</a>, we were wrongly trying to access the arguments of this button although they do not exist. In this particular case, we just need to only perform BP Nouveau's button reset when this button is generated: that is to say when someone else than the creator is viewing a group's page.
See <a href="http://buddypress.trac.wordpress.org/ticket/8722">#8722</a></pre>
<h3>Modified Paths</h3>
<ul>
<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="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-08-08 21:24:03 UTC (rev 13309)
+++ trunk/src/bp-templates/bp-nouveau/includes/groups/template-tags.php 2022-08-08 21:46:33 UTC (rev 13310)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -998,45 +998,47 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $button_args = bp_groups_get_group_join_button_args( $group );
</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 we pass through parent classes merge those into the existing ones
- if ( $parent_class ) {
- $parent_class .= ' ' . $button_args['wrapper_class'];
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $button_args ) {
+ // 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">- // 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';
- }
</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 earlier 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">- $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' => '',
- ),
- );
</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 button element set add nonce 'href' link to data-attr attr.
- if ( 'button' === $button_element ) {
- $buttons['group_membership']['button_attr']['data-bp-nonce'] = $button_args['link_href'];
- } else {
- // Else this is an anchor so use an 'href' attr.
- $buttons['group_membership']['button_attr']['href'] = $button_args['link_href'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // If button element set add nonce 'href' link to data-attr attr.
+ if ( 'button' === $button_element ) {
+ $buttons['group_membership']['button_attr']['data-bp-nonce'] = $button_args['link_href'];
+ } else {
+ // Else this is an anchor so use an 'href' attr.
+ $buttons['group_membership']['button_attr']['href'] = $button_args['link_href'];
+ }
</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>