<!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][6256] trunk/bp-themes/bp-default/comments.php: 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, #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><a href="http://buddypress.trac.wordpress.org/changeset/6256">6256</a></dd>
<dt>Author</dt> <dd>johnjamesjacoby</dd>
<dt>Date</dt> <dd>2012-08-14 20:49:51 +0000 (Tue, 14 Aug 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>Comments:
* Clean up comments.php
* Bail early if post type does not support comments.
* Improves handling of comments and form when not supported, or have no reason to appear.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpthemesbpdefaultcommentsphp">trunk/bp-themes/bp-default/comments.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpthemesbpdefaultcommentsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/comments.php (6255 => 6256)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/comments.php 2012-08-14 00:35:39 UTC (rev 6255)
+++ trunk/bp-themes/bp-default/comments.php 2012-08-14 20:49:51 UTC (rev 6256)
</span><span class="lines">@@ -1,21 +1,28 @@
</span><span class="cx"> <?php
</span><ins>+
+ // Bail if post type doesn't support comments
+ if ( ! post_type_supports( get_post_type(), 'comments' ) )
+ return;
+
+ // Bail if is a page, and comments are not open
+ if ( is_page() && ! have_comments() && ! comments_open() && ! pings_open() )
+ return;
+
</ins><span class="cx"> if ( post_password_required() ) {
</span><span class="cx"> echo '<h3 class="comments-header">' . __( 'Password Protected', 'buddypress' ) . '</h3>';
</span><span class="cx"> echo '<p class="alert password-protected">' . __( 'Enter the password to view comments.', 'buddypress' ) . '</p>';
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ( is_page() && !have_comments() && !comments_open() && !pings_open() )
- return;
-
</del><span class="cx"> if ( have_comments() ) :
</span><del>- $num_comments = 0;
</del><ins>+ $num_comments = 0;
</ins><span class="cx"> $num_trackbacks = 0;
</span><span class="cx"> foreach ( (array) $comments as $comment ) {
</span><del>- if ( 'comment' != get_comment_type() )
</del><ins>+ if ( 'comment' != get_comment_type() ) {
</ins><span class="cx"> $num_trackbacks++;
</span><del>- else
</del><ins>+ } else {
</ins><span class="cx"> $num_comments++;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx"> ?>
</span><span class="cx"> <div id="comments">
</span><span class="lines">@@ -39,23 +46,24 @@
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> </div><!-- #comments -->
</span><ins>+
</ins><span class="cx"> <?php else : ?>
</span><span class="cx">
</span><del>- <?php if ( pings_open() && !comments_open() && ( is_single() || is_page() ) ) : ?>
- <p class="comments-closed pings-open">
- <?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'buddypress' ), trackback_url( '0' ) ); ?>
- </p>
- <?php elseif ( !comments_open() && ( is_single() || is_page() ) ) : ?>
- <p class="comments-closed">
- <?php _e( 'Comments are closed.', 'buddypress' ); ?>
- </p>
</del><ins>+ <?php if ( ! comments_open() ) : ?>
+ <?php if ( pings_open() ) : ?>
+ <p class="comments-closed pings-open">
+ <?php printf( __( 'Comments are closed, but <a href="%1$s" title="Trackback URL for this post">trackbacks</a> and pingbacks are open.', 'buddypress' ), trackback_url( '0' ) ); ?>
+ </p>
+ <?php else : ?>
+ <p class="comments-closed">
+ <?php _e( 'Comments are closed.', 'buddypress' ); ?>
+ </p>
+ <?php endif; ?>
</ins><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><span class="cx"> <?php endif; ?>
</span><span class="cx">
</span><del>-<?php if ( comments_open() ) : ?>
- <?php comment_form(); ?>
-<?php endif; ?>
</del><ins>+<?php if ( comments_open() ) comment_form(); ?>
</ins><span class="cx">
</span><span class="cx"> <?php if ( !empty( $num_trackbacks ) ) : ?>
</span><span class="cx"> <div id="trackbacks">
</span></span></pre>
</div>
</div>
</body>
</html>