<!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][11715] trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php: Update Nouveau activity entry buttons 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 { 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/11715">11715</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/11715","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hnla</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2017-10-16 13:25:18 +0000 (Mon, 16 Oct 2017)</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'>Update Nouveau activity entry buttons args
Commit clears up a couple of undefined indexes & re-factors Fav button $args logic.
Add check for isset to 'container' key as it's not being passed a value unless set from the template function call - N.B this appears to manifest in loops outside default activity stream rendering where it was thought the $args would filter through from base defaults, this needs checking!
Update fav $args array - re-factor fav/unfav arrays for setting single href or data-* $key, add attr string link in fav/unfav arrays as a new key to combine both in final favs args array, clears up undefined $key issue, lightens code, & adds a little clarity.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbptemplatesbpnouveauincludesactivitytemplatetagsphp">trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbptemplatesbpnouveauincludesactivitytemplatetagsphp"></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/activity/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/activity/template-tags.php 2017-10-14 10:37:26 UTC (rev 11714)
+++ trunk/src/bp-templates/bp-nouveau/includes/activity/template-tags.php 2017-10-16 13:25:18 UTC (rev 11715)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -239,9 +239,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * If the container is set to 'ul' force the $parent_element to 'li',
</span><span class="cx" style="display: block; padding: 0 10px"> * else use parent_element args if set.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Will render li elements around anchors/buttons.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * This will render li elements around anchors/buttons.
</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 ( 'ul' === $args['container'] ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( isset( $args['container'] ) && 'ul' === $args['container'] ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $parent_element = 'li';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( ! empty( $args['parent_element'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $parent_element = $args['parent_element'];
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -332,6 +332,14 @@
</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"> if ( bp_activity_can_favorite() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // If button element set attr needs to be data-* else 'href'
+ if ( 'button' === $button_element ) {
+ $key = 'data-bp-nonce';
+ } else {
+ $key = 'href';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! bp_get_activity_is_favorite() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $fav_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_element' => $parent_element,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -341,16 +349,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'data_bp_tooltip' => __( 'Mark as Favorite', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_text' => __( 'Favorite', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'aria-pressed' => 'false',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_attr' => bp_get_activity_favorite_link(),
</ins><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">- // If button element set add nonce link to data-attr attr
- if ( 'button' === $button_element ) {
- $fav_args['data_attr'] = bp_get_activity_favorite_link();
- $key = 'data-bp-nonce';
- } else {
- $fav_args['link_href'] = bp_get_activity_favorite_link();
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $fav_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'parent_element' => $parent_element,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,15 +361,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'data_bp_tooltip' => __( 'Remove Favorite', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_text' => __( 'Remove Favorite', 'buddypress' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'aria-pressed' => 'true',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link_attr' => bp_get_activity_unfavorite_link(),
</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 link nonce to data-attr
- if ( 'button' === $button_element ) {
- $fav_args['data_attr'] = bp_get_activity_unfavorite_link();
- $key = 'data-bp-nonce';
- } else {
- $fav_args['link_href'] = bp_get_activity_unfavorite_link();
- }
</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"> $buttons['activity_favorite'] = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -381,11 +375,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'button_element' => $fav_args['button_element'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'link_text' => sprintf( '<span class="bp-screen-reader-text">%1$s</span>', esc_html( $fav_args['link_text'] ) ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'button_attr' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'href' => $fav_args['link_href'],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $key => $fav_args['link_attr'],
</ins><span class="cx" style="display: block; padding: 0 10px"> 'class' => $fav_args['link_class'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'data-bp-tooltip' => $fav_args['data_bp_tooltip'],
</span><span class="cx" style="display: block; padding: 0 10px"> 'aria-pressed' => $fav_args['aria-pressed'],
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $key => $fav_args['data_attr'],
</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>