Changes in trunk/wp-content/themes/twentyten/comments.php [14935:15145]

File:

• trunk/wp-content/themes/twentyten/comments.php (modified) (3 diffs)

trunk/wp-content/themes/twentyten/comments.php

@@ -16 +16 @@
             <div id="comments">
 <?php if ( post_password_required() ) : ?>
-                <div class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></div>
+                <p class="nopassword"><?php _e( 'This post is password protected. Enter the password to view any comments.', 'twentyten' ); ?></p>
             </div><!-- #comments -->
 <?php
@@ -37 +37 @@
             ?></h3>
 
-<?php if ( get_comment_pages_count() > 1 ) : // Are there comments to navigate through? ?>
+<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
             <div class="navigation">
                 <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>
@@ -56 +56 @@
             </ol>
 
-<?php if ( get_comment_pages_count() > 1 ) : // Are there comments to navigate through? ?>
+<?php if ( get_comment_pages_count() > 1 && get_option( 'page_comments' ) ) : // Are there comments to navigate through? ?>
             <div class="navigation">
                 <div class="nav-previous"><?php previous_comments_link( __( '<span class="meta-nav">&larr;</span> Older Comments', 'twentyten' ) ); ?></div>