<!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][8955] trunk/src/bp-activity/bp-activity-template.php: In `bp_activity_can_comment_reply()` check for and allow an empty `$comment` parameter, and set to `bp_activity_current_comment()` if so.</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">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8955">8955</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2014-08-22 15:43:26 +0000 (Fri, 22 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>In `bp_activity_can_comment_reply()` check for and allow an empty `$comment` parameter, and set to `bp_activity_current_comment()` if so. This prevents debug notices and allows for cleaner comparisons in template parts.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpactivitybpactivitytemplatephp">trunk/src/bp-activity/bp-activity-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-activity/bp-activity-template.php (8954 => 8955)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-activity/bp-activity-template.php 2014-08-21 17:22:07 UTC (rev 8954)
+++ trunk/src/bp-activity/bp-activity-template.php 2014-08-22 15:43:26 UTC (rev 8955)
</span><span class="lines">@@ -2592,7 +2592,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> $url = wp_nonce_url( $url, 'bp_activity_delete_link' );
</span><del>-
</del><ins>+
</ins><span class="cx"> return apply_filters( 'bp_get_activity_delete_url', $url );
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2763,7 +2763,7 @@
</span><span class="cx"> // Determine ability to comment based on activity action name
</span><span class="cx"> $activity_action = bp_get_activity_action_name();
</span><span class="cx"> switch ( $activity_action ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Maybe turn off for blog and forum updates
</span><span class="cx"> case 'new_blog_post' :
</span><span class="cx"> case 'new_blog_comment' :
</span><span class="lines">@@ -2792,26 +2792,34 @@
</span><span class="cx"> * @return bool $can_comment True if comment can receive comments, otherwise
</span><span class="cx"> * false.
</span><span class="cx"> */
</span><del>-function bp_activity_can_comment_reply( $comment ) {
</del><ins>+function bp_activity_can_comment_reply( $comment = '' ) {
</ins><span class="cx">
</span><span class="cx"> // Assume activity can be commented on
</span><span class="cx"> $can_comment = true;
</span><span class="cx">
</span><del>- // Fall back on current comment in activity loop
- $comment_depth = isset( $comment->depth )
- ? intval( $comment->depth )
- : bp_activity_get_comment_depth();
</del><ins>+ // Check that comment exists
+ if ( empty( $comment ) ) {
+ $comment = bp_activity_current_comment();
+ }
</ins><span class="cx">
</span><del>- // Threading is turned on, so check the depth
- if ( get_option( 'thread_comments' ) ) {
- $can_comment = (bool) ( $comment_depth < get_option( 'thread_comments_depth' ) );
</del><ins>+ if ( ! empty( $comment ) ) {
</ins><span class="cx">
</span><del>- // No threading for comment replies if no threading for comments
- } else {
- $can_comment = false;
</del><ins>+ // Fall back on current comment in activity loop
+ $comment_depth = isset( $comment->depth )
+ ? intval( $comment->depth )
+ : bp_activity_get_comment_depth();
+
+ // Threading is turned on, so check the depth
+ if ( get_option( 'thread_comments' ) ) {
+ $can_comment = (bool) ( $comment_depth < get_option( 'thread_comments_depth' ) );
+
+ // No threading for comment replies if no threading for comments
+ } else {
+ $can_comment = false;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- return apply_filters( 'bp_activity_can_comment_reply', $can_comment, $comment );
</del><ins>+ return (bool) apply_filters( 'bp_activity_can_comment_reply', $can_comment, $comment );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -2868,8 +2876,8 @@
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_total_favorite_count_for_user', $retval );
</span><span class="cx"> }
</span><del>-
</del><span class="cx">
</span><ins>+
</ins><span class="cx"> /**
</span><span class="cx"> * Output the total mention count for a specified user.
</span><span class="cx"> *
</span><span class="lines">@@ -3188,7 +3196,7 @@
</span><span class="cx"> * @return array Array of user IDs.
</span><span class="cx"> */
</span><span class="cx"> function bp_activity_recurse_comments_user_ids( array $comments = array() ) {
</span><del>-
</del><ins>+
</ins><span class="cx"> // Default user ID's array
</span><span class="cx"> $user_ids = array();
</span><span class="cx">
</span><span class="lines">@@ -3359,19 +3367,19 @@
</span><span class="cx"> // Single member activity feed link
</span><span class="cx"> if ( bp_is_profile_component() || bp_is_current_action( 'just-me' ) ) {
</span><span class="cx"> $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/feed/';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Friend feed link
</span><span class="cx"> } elseif ( bp_is_active( 'friends' ) && bp_is_current_action( bp_get_friends_slug() ) ) {
</span><span class="cx"> $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_friends_slug() . '/feed/';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Group feed link
</span><del>- } elseif ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
</del><ins>+ } elseif ( bp_is_active( 'groups' ) && bp_is_current_action( bp_get_groups_slug() ) ) {
</ins><span class="cx"> $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/' . bp_get_groups_slug() . '/feed/';
</span><span class="cx">
</span><span class="cx"> // Favorites activity feed link
</span><span class="cx"> } elseif ( 'favorites' === bp_current_action() ) {
</span><span class="cx"> $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/favorites/feed/';
</span><del>-
</del><ins>+
</ins><span class="cx"> // Mentions activity feed link
</span><span class="cx"> } elseif ( ( 'mentions' === bp_current_action() ) && bp_activity_do_mentions() ) {
</span><span class="cx"> $link = bp_displayed_user_domain() . bp_get_activity_slug() . '/mentions/feed/';
</span></span></pre>
</div>
</div>
</body>
</html>