<!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] [2527] trunk/bp-themes/bp-default/functions.php:
Removing fetching of BP details on comment template since this is now done via filters
.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2527</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-02-01 16:42:04 +0000 (Mon, 01 Feb 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Removing fetching of BP details on comment template since this is now done via filters.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (2526 => 2527)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php        2010-02-01 15:52:07 UTC (rev 2526)
+++ trunk/bp-themes/bp-default/functions.php        2010-02-01 16:42:04 UTC (rev 2527)
</span><span class="lines">@@ -60,44 +60,37 @@
</span><span class="cx"> add_action( 'template_redirect', 'bp_dtheme_add_blog_comments_js' );
</span><span class="cx">
</span><span class="cx"> function bp_dtheme_blog_comments( $comment, $args, $depth ) {
</span><del>- $GLOBALS['comment'] = $comment;
-        $comment_type = get_comment_type();
</del><ins>+ $GLOBALS['comment'] = $comment; ?>
</ins><span class="cx">
</span><del>-        if ( $comment->user_id )
-                $userlink = bp_core_get_user_domain( $comment->user_id );
</del><ins>+        <li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
+                <div class="comment-avatar-box">
+                        <div class="avb">
+                                <a href="<?php echo get_comment_author_url() ?>">
+                                        <?php echo get_avatar( $comment, 50 ); ?>
+                                </a>
+                        </div>
+                </div>
</ins><span class="cx">
</span><del>-        if ( $comment_type == 'comment' ) { ?>
- <li <?php comment_class(); ?> id="comment-<?php comment_ID(); ?>">
</del><ins>+                <div class="comment-content">
</ins><span class="cx">
</span><del>-                        <div class="comment-avatar-box<?php if ( $comment->user_id ) : ?> extra<?php endif; ?>">
-                                <div class="avb">
-                                        <a href="<?php if ( $userlink ) : echo $userlink; else : echo get_comment_author_url(); endif;?>">
-                                                <?php echo get_avatar( $comment, 50 ); ?>
-                                        </a>
-                                </div>
</del><ins>+                        <div class="comment-meta">
+                                <a href="<?php echo get_comment_author_url() ?>"><?php echo get_comment_author(); ?></a> <?php _e( 'said:', 'buddypress' ) ?>
+                                <em><?php _e( 'On', 'buddypress' ) ?> <a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date() ?></a></em>
</ins><span class="cx">                         </div>
</span><span class="cx">
</span><del>-                        <div class="comment-content">
</del><ins>+                        <?php if ($comment->comment_approved == '0') : ?>
+                                 <em class="moderate"><?php _e('Your comment is awaiting moderation.'); ?></em><br />
+                        <?php endif; ?>
</ins><span class="cx">
</span><del>-                                <div class="comment-meta">
-                                        <a href="<?php if ( $userlink ) : echo $userlink; else : echo get_comment_author_url(); endif;?>"><?php echo get_comment_author(); ?></a> <?php _e( 'said:', 'buddypress' ) ?>
-                                        <em><?php _e( 'On', 'buddypress' ) ?> <a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date() ?></a></em>
-         </div>
</del><ins>+                        <?php comment_text() ?>
</ins><span class="cx">
</span><del>-                                <?php if ($comment->comment_approved == '0') : ?>
-                 <em class="moderate"><?php _e('Your comment is awaiting moderation.'); ?></em><br />
-         <?php endif; ?>
-
-                                <?php comment_text() ?>
-
-                                <div class="comment-options">
-                                        <?php echo comment_reply_link( array('depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?>
-                                        <?php edit_comment_link( __( 'Edit' ),'','' ); ?>
-                                </div>
-
</del><ins>+                        <div class="comment-options">
+                                <?php echo comment_reply_link( array('depth' => $depth, 'max_depth' => $args['max_depth'] ) ) ?>
+                                <?php edit_comment_link( __( 'Edit' ),'','' ); ?>
</ins><span class="cx">                         </div>
</span><del>- </li>
-        <?php } ?>
</del><ins>+
+                </div>
+        </li>
</ins><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>