<!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][8344] branches/2.0/bp-blogs/bp-blogs-activity.php: Blogs: Formatting improvements for activity comments connected to blog comments.</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/8344">8344</a></dd>
<dt>Author</dt> <dd>r-a-y</dd>
<dt>Date</dt> <dd>2014-05-02 20:12:10 +0000 (Fri, 02 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Blogs: Formatting improvements for activity comments connected to blog comments.
This commit:
- Readjusts the permalink for singular activity comments connected to blog comments to use the comment permalink instead of the activity thread permalink
- Readjusts the activity action for singular activity comments connected to blog comments to use the familiar blog comment action instead of the generic "posted an activity comment" action
See <a href="http://buddypress.trac.wordpress.org/ticket/5560">#5560</a> (2.0-branch)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches20bpblogsbpblogsactivityphp">branches/2.0/bp-blogs/bp-blogs-activity.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branches20bpblogsbpblogsactivityphp"></a>
<div class="modfile"><h4>Modified: branches/2.0/bp-blogs/bp-blogs-activity.php (8343 => 8344)</h4>
<pre class="diff"><span>
<span class="info">--- branches/2.0/bp-blogs/bp-blogs-activity.php 2014-05-02 19:40:26 UTC (rev 8343)
+++ branches/2.0/bp-blogs/bp-blogs-activity.php 2014-05-02 20:12:10 UTC (rev 8344)
</span><span class="lines">@@ -852,3 +852,68 @@
</span><span class="cx"> return $retval;
</span><span class="cx"> }
</span><span class="cx"> add_filter( 'bp_get_activity_comment_permalink', 'bp_blogs_activity_comment_permalink' );
</span><ins>+
+/**
+ * Changes single activity comment entries to use the blog comment permalink.
+ *
+ * This is only done if the activity comment is associated with a blog comment.
+ *
+ * @since BuddyPress (2.0.1)
+ *
+ * @param string $retval The activity permalink
+ * @param BP_Activity_Activity $activity
+ * @return string
+ */
+function bp_blogs_activity_comment_single_permalink( $retval, $activity ) {
+ if ( 'activity_comment' !== $activity->type ) {
+ return $retval;
+ }
+
+ $blog_comment_id = bp_activity_get_meta( $activity->id, 'bp_blogs_post_comment_id' );
+
+ if ( ! empty( $blog_comment_id ) ) {
+ $retval = $activity->primary_link;
+ }
+
+ return $retval;
+}
+add_filter( 'bp_activity_get_permalink', 'bp_blogs_activity_comment_single_permalink', 10, 2 );
+
+/**
+ * Formats single activity comment entries to use the blog comment action.
+ *
+ * This is only done if the activity comment is associated with a blog comment.
+ *
+ * @since BuddyPress (2.0.1)
+ *
+ * @param string $retval The activity action
+ * @param BP_Activity_Activity $activity
+ * @return string
+ */
+function bp_blogs_activity_comment_single_action( $retval, $activity ) {
+ if ( 'activity_comment' !== $activity->type ) {
+ return $retval;
+ }
+
+ $blog_comment_id = bp_activity_get_meta( $activity->id, 'bp_blogs_post_comment_id' );
+
+ if ( ! empty( $blog_comment_id ) ) {
+ // fetch the parent blog post activity item
+ $parent_blog_post_activity = new BP_Activity_Activity( $activity->item_id );
+
+ // fake a 'new_blog_comment' activity object
+ $object = $activity;
+
+ // override 'item_id' to use blog ID
+ $object->item_id = $parent_blog_post_activity->item_id;
+
+ // override 'secondary_item_id' to use comment ID
+ $object->secondary_item_id = $blog_comment_id;
+
+ // now format the activity action using the 'new_blog_comment' action callback
+ $retval = bp_blogs_format_activity_action_new_blog_comment( '', $object );
+ }
+
+ return $retval;
+}
+add_filter( 'bp_get_activity_action_pre_meta', 'bp_blogs_activity_comment_single_action', 10, 2 );
</ins></span></pre>
</div>
</div>
</body>
</html>