<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[BuddyPress] [2138] trunk/bp-activity:
Adding support for showing parent activity item below an in-stream activity comment
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2138</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2009-11-26 15:06:59 +0000 (Thu, 26 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adding support for showing parent activity item below an in-stream activity comment.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivityclassesphp">trunk/bp-activity/bp-activity-classes.php</a></li>
<li><a href="#trunkbpactivitybpactivityfiltersphp">trunk/bp-activity/bp-activity-filters.php</a></li>
<li><a href="#trunkbpactivitybpactivitytemplatetagsphp">trunk/bp-activity/bp-activity-templatetags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivityclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-classes.php (2137 => 2138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-classes.php 2009-11-26 14:11:09 UTC (rev 2137)
+++ trunk/bp-activity/bp-activity-classes.php 2009-11-26 15:06:59 UTC (rev 2138)
</span><span class="lines">@@ -395,12 +395,12 @@
</span><span class="cx"> foreach ( $descendants as $d ) {
</span><span class="cx"> $d->children = array();
</span><span class="cx">
</span><del>- /* We have a reference on its parent */
</del><ins>+ /* If we have a reference on the parent */
</ins><span class="cx"> if ( isset( $ref[ $d->secondary_item_id ] ) ) {
</span><span class="cx"> $ref[ $d->secondary_item_id ]->children[ $d->id ] = $d;
</span><span class="cx"> $ref[ $d->id ] =& $ref[ $d->secondary_item_id ]->children[ $d->id ];
</span><span class="cx">
</span><del>- /* We don't have a reference on its parent, put it a root level */
</del><ins>+ /* If we don't have a reference on the parent, put in the root level */
</ins><span class="cx"> } else {
</span><span class="cx"> $menu[ $d->id ] = $d;
</span><span class="cx"> $ref[ $d->id ] =& $menu[ $d->id ];
</span></span></pre></div>
<a id="trunkbpactivitybpactivityfiltersphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-filters.php (2137 => 2138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-filters.php 2009-11-26 14:11:09 UTC (rev 2137)
+++ trunk/bp-activity/bp-activity-filters.php 2009-11-26 15:06:59 UTC (rev 2138)
</span><span class="lines">@@ -2,16 +2,29 @@
</span><span class="cx">
</span><span class="cx"> /* Apply WordPress defined filters */
</span><span class="cx"> add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
</span><del>-add_filter( 'bp_get_activity_content', 'bp_activity_filter_kses', 1 );
</del><ins>+add_filter( 'bp_get_activity_parent_content', 'bp_activity_filter_kses', 1 );
</ins><span class="cx">
</span><span class="cx"> add_filter( 'bp_get_activity_content', 'force_balance_tags' );
</span><ins>+
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'wptexturize' );
</span><ins>+add_filter( 'bp_get_activity_parent_content', 'wptexturize' );
+
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'convert_smilies' );
</span><ins>+add_filter( 'bp_get_activity_parent_content', 'convert_smilies' );
+
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'convert_chars' );
</span><ins>+add_filter( 'bp_get_activity_parent_content', 'convert_chars' );
+
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'wpautop' );
</span><ins>+
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'make_clickable' );
</span><ins>+add_filter( 'bp_get_activity_parent_content', 'make_clickable' );
+
</ins><span class="cx"> add_filter( 'bp_get_activity_content', 'stripslashes_deep' );
</span><ins>+add_filter( 'bp_get_activity_parent_content', 'stripslashes_deep' );
</ins><span class="cx">
</span><ins>+add_filter( 'bp_get_activity_parent_content', 'bp_create_excerpt' );
+
</ins><span class="cx"> function bp_activity_filter_kses( $content ) {
</span><span class="cx"> global $allowedtags;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbpactivitybpactivitytemplatetagsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-templatetags.php (2137 => 2138)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-templatetags.php 2009-11-26 14:11:09 UTC (rev 2137)
+++ trunk/bp-activity/bp-activity-templatetags.php 2009-11-26 15:06:59 UTC (rev 2138)
</span><span class="lines">@@ -359,6 +359,49 @@
</span><span class="cx"> return apply_filters( 'bp_activity_content_filter', $content_new );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+function bp_activity_parent_content( $args = '' ) {
+ echo bp_get_activity_parent_content($args);
+}
+ function bp_get_activity_parent_content( $args = '' ) {
+ global $bp, $activities_template;
+
+ $defaults = array(
+ 'hide_user' => false
+ );
+
+ $r = wp_parse_args( $args, $defaults );
+ extract( $r, EXTR_SKIP );
+
+ /* Get the ID of the parent activity content */
+ if ( !$parent_id = $activities_template->activity->item_id )
+ return false;
+
+ /* Get the content of the parent by first checking to see if we already have it */
+ $parent_activity = false;
+
+ foreach( $activities_template->activities as $activity ) {
+ if ( $parent_id == $activity->id ) {
+ /* Need a copy not a reference, this was the only PHP4 compat way I could find. */
+ $parent_activity = (array)$activity;
+ $parent_activity = (object)$parent_activity;
+ }
+ }
+
+ /* We didn't find it, so let's get it from the DB */
+ if ( !$parent_activity ) {
+ $parent_activity = bp_activity_get_specific( array( 'activity_ids' => $parent_id ) );
+ $parent_activity = $parent_activity['activities'][0];
+ }
+
+ if ( !$parent_activity )
+ return false;
+
+ /* Remove the time since content */
+ $parent_activity->content = str_replace( '<span class="time-since">%s</span>', '', $parent_activity->content );
+
+ return apply_filters( 'bp_get_activity_parent_content', $parent_activity->content );
+ }
+
</ins><span class="cx"> function bp_activity_comments( $args = '' ) {
</span><span class="cx"> echo bp_activity_get_comments( $args );
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>