<!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][4493] trunk: Moves activity reply HTML to a comment.php template.</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, #logmsg > ol { margin-left: 0; 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>4493</dd>
<dt>Author</dt> <dd>boonebgorges</dd>
<dt>Date</dt> <dd>2011-06-12 13:06:21 +0000 (Sun, 12 Jun 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Moves activity reply HTML to a comment.php template. Fixes #3253</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpactivitybpactivitytemplatephp">trunk/bp-activity/bp-activity-template.php</a></li>
<li><a href="#trunkbpthemesbpdefaultactivityentryphp">trunk/bp-themes/bp-default/activity/entry.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultactivitycommentphp">trunk/bp-themes/bp-default/activity/comment.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpactivitybpactivitytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/bp-activity/bp-activity-template.php (4492 => 4493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-activity/bp-activity-template.php 2011-06-12 12:30:57 UTC (rev 4492)
+++ trunk/bp-activity/bp-activity-template.php 2011-06-12 13:06:21 UTC (rev 4493)
</span><span class="lines">@@ -536,12 +536,13 @@
</span><span class="cx"> global $bp, $activities_template;
</span><span class="cx">
</span><span class="cx"> $defaults = array(
</span><del>- 'type' => 'thumb',
- 'width' => 20,
- 'height' => 20,
- 'class' => 'avatar',
- 'alt' => __( 'Profile picture of %s', 'buddypress' ),
- 'email' => false
</del><ins>+ 'type' => 'thumb',
+ 'width' => 20,
+ 'height' => 20,
+ 'class' => 'avatar',
+ 'alt' => __( 'Profile picture of %s', 'buddypress' ),
+ 'email' => false,
+ 'user_id' => false
</ins><span class="cx"> );
</span><span class="cx">
</span><span class="cx"> $r = wp_parse_args( $args, $defaults );
</span><span class="lines">@@ -552,7 +553,7 @@
</span><span class="cx"> $item_id = apply_filters( 'bp_get_activity_avatar_item_id', $activities_template->activity->user_id );
</span><span class="cx">
</span><span class="cx"> // If this is a user object pass the users' email address for Gravatar so we don't have to refetch it.
</span><del>- if ( 'user' == $object && empty( $email ) && isset( $activities_template->activity->user_email ) )
</del><ins>+ if ( 'user' == $object && empty( $user_id ) && empty( $email ) && isset( $activities_template->activity->user_email ) )
</ins><span class="cx"> $email = $activities_template->activity->user_email;
</span><span class="cx">
</span><span class="cx"> return apply_filters( 'bp_get_activity_avatar', bp_core_fetch_avatar( array( 'item_id' => $item_id, 'object' => $object, 'type' => $type, 'alt' => $alt, 'class' => $class, 'width' => $width, 'height' => $height, 'email' => $email ) ) );
</span><span class="lines">@@ -775,92 +776,292 @@
</span><span class="cx"> return apply_filters( 'bp_get_activity_is_favorite', in_array( $activities_template->activity->id, (array)$activities_template->my_favs ) );
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/**
+ * Echoes the comment markup for an activity item
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ *
+ * @param str $args Unused
+ */
</ins><span class="cx"> function bp_activity_comments( $args = '' ) {
</span><span class="cx"> echo bp_activity_get_comments( $args );
</span><span class="cx"> }
</span><ins>+ /**
+ * Gets the comment markup for an activity item
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ *
+ * @param str $args Unused. Appears to be left over from an earlier implementation.
+ * @todo Given that checks for children already happen in bp_activity_recurse_comments(),
+ * this function can probably be streamlined or removed.
+ */
</ins><span class="cx"> function bp_activity_get_comments( $args = '' ) {
</span><span class="cx"> global $activities_template, $bp;
</span><span class="cx">
</span><span class="cx"> if ( !isset( $activities_template->activity->children ) || !$activities_template->activity->children )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $comments_html = bp_activity_recurse_comments( $activities_template->activity );
-
- return apply_filters( 'bp_activity_get_comments', $comments_html );
</del><ins>+ bp_activity_recurse_comments( $activities_template->activity );
</ins><span class="cx"> }
</span><del>- // TODO: The HTML in this function is temporary and will be moved
- // to the template in a future version
</del><ins>+
+ /**
+ * Loops through a level of activity comments and loads the template for each
+ *
+ * Note: The recursion itself used to happen entirely in this function. Now it is
+ * split between here and the comment.php template.
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ *
+ * @param obj $comment The activity object currently being recursed
+ */
</ins><span class="cx"> function bp_activity_recurse_comments( $comment ) {
</span><del>- global $activities_template, $bp;
-
</del><ins>+ global $activities_template, $bp, $counter;
+
+ if ( !$comment )
+ return false;
+
</ins><span class="cx"> if ( !$comment->children )
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- $content = '<ul>';
</del><ins>+ echo '<ul>';
</ins><span class="cx"> foreach ( (array)$comment->children as $comment_child ) {
</span><span class="cx"> // Put the comment into the global so it's available to filters
</span><span class="cx"> $activities_template->activity->current_comment = $comment_child;
</span><span class="cx">
</span><del>- if ( empty( $comment_child->user_fullname ) )
- $comment_child->user_fullname = $comment_child->display_name;
</del><ins>+ $template = locate_template( 'activity/comment.php', false, false );
+
+ // Backward compatibility. In older versions of BP, the markup was
+ // generated in the PHP instead of a template. This ensures that
+ // older themes (which are not children of bp-default and won't
+ // have the new template) will still work.
+ if ( !$template ) {
+ $template = BP_PLUGIN_DIR . '/bp-themes/bp-default/activity/comment.php';
+ }
+
+ load_template( $template, false );
+
+ unset( $activities_template->activity->current_comment );
+ }
+ echo '</ul>';
+ }
</ins><span class="cx">
</span><del>- if ( empty( $comment_child->user_nicename ) )
- $comment_child->user_nicename = '';
</del><ins>+/**
+ * Utility function that returns the comment currently being recursed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ *
+ * @return obj $current_comment The activity comment currently being displayed
+ */
+function bp_activity_current_comment() {
+ global $activities_template;
+
+ $current_comment = !empty( $activities_template->activity->current_comment ) ? $activities_template->activity->current_comment : false;
+
+ return apply_filters( 'bp_activity_current_comment', $current_comment );
+}
</ins><span class="cx">
</span><del>- if ( empty( $comment_child->user_login ) )
- $comment_child->user_login = '';
</del><span class="cx">
</span><del>- if ( empty( $comment_child->user_email ) )
- $comment_child->user_email = '';
</del><ins>+/**
+ * Echoes the id of the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ */
+function bp_activity_comment_id() {
+ echo bp_get_activity_comment_id();
+}
+ /**
+ * Gets the id of the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ *
+ * @return int $comment_id The id of the activity comment currently being displayed
+ */
+ function bp_get_activity_comment_id() {
+ global $activities_template;
+
+ $comment_id = isset( $activities_template->activity->current_comment->id ) ? $activities_template->activity->current_comment->id : false;
+
+ return apply_filters( 'bp_activity_comment_id', $comment_id );
+ }
</ins><span class="cx">
</span><del>- $content .= '<li id="acomment-' . $comment_child->id . '">';
- $content .= '<div class="acomment-avatar"><a href="' .
- bp_core_get_user_domain(
- $comment_child->user_id,
- $comment_child->user_nicename,
- $comment_child->user_login ) . '">' .
- bp_core_fetch_avatar( array(
- 'alt' => __( 'Profile picture of %s', 'buddypress' ),
- 'item_id' => $comment_child->user_id,
- 'width' => 30,
- 'height' => 30,
- 'email' => $comment_child->user_email
- ) ) .
- '</a></div>';
</del><ins>+/**
+ * Echoes the user_id of the author of the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ */
+function bp_activity_comment_user_id() {
+ echo bp_get_activity_comment_user_id();
+}
+ /**
+ * Gets the user_id of the author of the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ *
+ * @return int $user_id The user_id of the author of the displayed activity comment
+ */
+ function bp_get_activity_comment_user_id() {
+ global $activities_template;
+
+ $user_id = isset( $activities_template->activity->current_comment->user_id ) ? $activities_template->activity->current_comment->user_id : false;
+
+ return apply_filters( 'bp_activity_comment_user_id', $user_id );
+ }
</ins><span class="cx">
</span><del>- $content .= '<div class="acomment-meta"><a href="' .
- bp_core_get_user_domain(
- $comment_child->user_id,
- $comment_child->user_nicename,
- $comment_child->user_login ) . '">' .
- apply_filters( 'bp_acomment_name', $comment_child->user_fullname, $comment_child ) .
- '</a> &middot; ' . sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( $comment_child->date_recorded ) );
</del><ins>+/**
+ * Echoes the author link for the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ */
+function bp_activity_comment_user_link() {
+ echo bp_get_activity_comment_user_link();
+}
+ /**
+ * Gets the author link for the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ *
+ * @return str $user_link The URL of the activity comment author's profile
+ */
+ function bp_get_activity_comment_user_link() {
+ $user_link = bp_core_get_user_domain( bp_get_activity_comment_user_id() );
+
+ return apply_filters( 'bp_activity_comment_user_link', $user_link );
+ }
</ins><span class="cx">
</span><del>- // Reply link - the span is so that threaded reply links can be
- // hidden when JS is off.
- if ( is_user_logged_in() && bp_activity_can_comment_reply( $comment ) )
- $content .= apply_filters( 'bp_activity_comment_reply_link', '<span class="acomment-replylink"> &middot; <a href="#acomment-' . $comment_child->id . '" class="acomment-reply" id="acomment-reply-' . $activities_template->activity->id . '">' . __( 'Reply', 'buddypress' ) . '</a></span>', $comment_child );
</del><ins>+/**
+ * Echoes the author name for the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ */
+function bp_activity_comment_name() {
+ echo bp_get_activity_comment_name();
+}
+ /**
+ * Gets the author name for the activity comment currently being displayed
+ *
+ * The use of the bp_acomment_name filter is deprecated. Please use bp_activity_comment_name
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ *
+ * @return str $name The full name of the activity comment author
+ */
+ function bp_get_activity_comment_name() {
+ global $activities_template;
+
+ $name = apply_filters( 'bp_acomment_name', $activities_template->activity->current_comment->user_fullname, $activities_template->activity->current_comment ); // backward compatibility
+
+ return apply_filters( 'bp_activity_comment_name', $name );
+ }
</ins><span class="cx">
</span><del>- // Delete link
- if ( $bp->loggedin_user->is_super_admin || $bp->loggedin_user->id == $comment->user_id ) {
- $delete_url = wp_nonce_url( bp_get_root_domain() . '/' . $bp->activity->slug . '/delete/?cid=' . $comment_child->id, 'bp_activity_delete_link' );
- $content .= apply_filters( 'bp_activity_comment_delete_link', ' &middot; <a href="' . $delete_url . '" class="delete acomment-delete confirm" rel="nofollow">' . __( 'Delete', 'buddypress' ) . '</a>', $comment_child, $delete_url );
- }
</del><ins>+/**
+ * Echoes the date_recorded of the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ */
+function bp_activity_comment_date_recorded() {
+ echo bp_get_activity_comment_date_recorded();
+}
+ /**
+ * Gets the date_recorded for the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ *
+ * @return str $date_recorded Time since the activity was recorded, of the form "%s ago"
+ */
+ function bp_get_activity_comment_date_recorded() {
+ global $activities_template;
+
+ if ( empty( $activities_template->activity->current_comment->date_recorded ) )
+ return false;
+
+ $date_recorded = sprintf( __( '%s ago', 'buddypress' ), bp_core_time_since( $activities_template->activity->current_comment->date_recorded ) );
+
+ return apply_filters( 'bp_activity_comment_date_recorded', $date_recorded );
+ }
</ins><span class="cx">
</span><del>- $content .= '</div>';
- $content .= '<div class="acomment-content">' . apply_filters( 'bp_get_activity_content', $comment_child->content ) . '</div>';
</del><ins>+/**
+ * Echoes the 'delete' URL for the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ */
+function bp_activity_comment_delete_link() {
+ echo bp_get_activity_comment_delete_link();
+}
+ /**
+ * Gets the 'delete' URL for the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ *
+ * @return str $link The nonced URL for deleting the current activity comment
+ */
+ function bp_get_activity_comment_delete_link() {
+ global $bp;
+
+ $link = wp_nonce_url( bp_get_root_domain() . '/' . $bp->activity->slug . '/delete/?cid=' . bp_get_activity_comment_id(), 'bp_activity_delete_link' );
+
+ return apply_filters( 'bp_activity_comment_delete_link', $link );
+ }
</ins><span class="cx">
</span><del>- $content .= bp_activity_recurse_comments( $comment_child );
- $content .= '</li>';
</del><ins>+/**
+ * Echoes the content of the activity comment currently being displayed
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ */
+function bp_activity_comment_content() {
+ echo bp_get_activity_comment_content();
+}
+ /**
+ * Gets the content of the activity comment currently being displayed
+ *
+ * The content is run through two filters. bp_get_activity_content will apply all filters
+ * applied to activity items in general. Use bp_activity_comment_content to modify the
+ * content of activity comments only.
+ *
+ * @package BuddyPress
+ * @subpackage Activity Template
+ * @since 1.3
+ *
+ * @return str $content The content of the current activity comment
+ */
+ function bp_get_activity_comment_content() {
+ global $activities_template;
+
+ $content = apply_filters( 'bp_get_activity_content', $activities_template->activity->current_comment->content );
+
+ return apply_filters( 'bp_activity_comment_content', $content );
+ }
</ins><span class="cx">
</span><del>- // Unset in the global in case of the last iteration
- unset( $activities_template->activity->current_comment );
- }
- $content .= '</ul>';
-
- return apply_filters( 'bp_activity_recurse_comments', $content );
- }
-
</del><span class="cx"> function bp_activity_comment_count() {
</span><span class="cx"> echo bp_activity_get_comment_count();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultactivitycommentphp"></a>
<div class="addfile"><h4>Added: trunk/bp-themes/bp-default/activity/comment.php (0 => 4493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/comment.php (rev 0)
+++ trunk/bp-themes/bp-default/activity/comment.php 2011-06-12 13:06:21 UTC (rev 4493)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+<?php
+
+/**
+ * BuddyPress - Activity Stream Comment
+ *
+ * This template is used by bp_activity_comments() functions to show
+ * each activity.
+ *
+ * @package BuddyPress
+ * @subpackage bp-default
+ */
+
+?>
+
+<?php do_action( 'bp_before_activity_comment' ); ?>
+
+<li id="acomment-<?php bp_activity_comment_id() ?>">
+ <div class="acomment-avatar">
+ <a href="<?php bp_activity_comment_user_link() ?>">
+ <?php bp_activity_avatar( 'type=full&width=30&height=30&user_id=' . bp_get_activity_comment_user_id() ); ?>
+ </a>
+ </div>
+
+ <div class="acomment-meta">
+ <a href="<?php bp_activity_comment_user_link() ?>"><?php bp_activity_comment_name() ?></a> &middot; <?php bp_activity_comment_date_recorded() ?>
+
+ <?php if ( is_user_logged_in() && bp_activity_can_comment_reply( bp_activity_current_comment() ) ) : ?>
+ <span class="acomment-replylink"> &middot; <a href="#acomment-<?php bp_activity_comment_id() ?>" class="acomment-reply" id="acomment-reply-<?php bp_activity_id() ?>"><?php _e( 'Reply', 'buddypress' ) ?></a></span>
+ <?php endif ?>
+
+ <?php if ( bp_activity_user_can_delete() ) : ?>
+ &middot; <a href="<?php bp_activity_comment_delete_link() ?>" class="delete acomment-delete confirm" rel="nofollow"><?php _e( 'Delete', 'buddypress' ) ?></a>
+ <?php endif ?>
+
+ </div>
+
+
+ <div class="acomment-content">
+ <?php bp_activity_comment_content() ?>
+ </div>
+
+ <?php bp_activity_recurse_comments( bp_activity_current_comment() ) ?>
+</li>
+
+<?php do_action( 'bp_after_activity_comment' ); ?>
</ins></span></pre></div>
<a id="trunkbpthemesbpdefaultactivityentryphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/activity/entry.php (4492 => 4493)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/activity/entry.php 2011-06-12 12:30:57 UTC (rev 4492)
+++ trunk/bp-themes/bp-default/activity/entry.php 2011-06-12 13:06:21 UTC (rev 4493)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx">
</span><span class="cx"> <?php if ( bp_activity_can_comment() ) : ?>
</span><span class="cx"> <div class="activity-comments">
</span><del>-
</del><ins>+
</ins><span class="cx"> <?php bp_activity_comments(); ?>
</span><span class="cx">
</span><span class="cx"> <?php if ( is_user_logged_in() ) : ?>
</span></span></pre>
</div>
</div>
</body>
</html>