From 93b372f1f85e73b170ec2c95d60d00fc13cc7922 Mon Sep 17 00:00:00 2001
From: dd32 <dd32@1a063a9b-81f0-0310-95a4-ce76da25c4cd>
Date: Sun, 14 Feb 2010 01:16:58 +0000
Subject: [PATCH] Comments.php PHP cleanup. See #9015

git-svn-id: http://svn.automattic.com/wordpress/trunk@13130 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-content/themes/twentyten/comments.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/wp-content/themes/twentyten/comments.php b/wp-content/themes/twentyten/comments.php
index cd86ce6e1..39f019641 100644
--- a/wp-content/themes/twentyten/comments.php
+++ b/wp-content/themes/twentyten/comments.php
@@ -1,11 +1,10 @@
-			<div id="comments">
 <?php
 	// Do not delete these lines
-	$req = get_option( 'require_name_email' ); // Checks if fields are required.
-	if ( 'comments.php' == basename($_SERVER['SCRIPT_FILENAME']) )
+	if ( ! defined('ABSPATH') )
 		die ( __( 'Please do not load this page directly. Thanks!', 'twentyten' ) );
-	if ( post_password_required() ) :
 ?>
+			<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>
 			</div><!-- .comments -->
 <?php
@@ -20,7 +19,7 @@
 <?php if ( have_comments() ) : ?>
 			<h3 id="comments-title"><?php comments_number( __('No Responses to', 'twentyten'), __('One Response to', 'twentyten'), __('% Responses to', 'twentyten') );?>  <em><?php the_title(); ?></em></h3>
 
-<?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
+<?php if ( get_comment_pages_count() > 1 ) : // are there comments to navigate through ?>
 			<div class="navigation">
 				<div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ); ?></div>
 				<div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ); ?></div>
@@ -31,7 +30,7 @@
 				<?php wp_list_comments( array('callback' => 'twentyten_list_comment') ); ?>
 			</ol>
 
-<?php $total_pages = get_comment_pages_count(); if ( $total_pages > 1 ) : // are there comments to navigate through ?>
+<?php if ( get_comment_pages_count() > 1 ) : // are there comments to navigate through ?>
 			<div class="navigation">
 				<div class="nav-previous"><?php previous_comments_link( __('&larr; Older Comments', 'twentyten') ); ?></div>
 				<div class="nav-next"><?php next_comments_link( __('Newer Comments &rarr;', 'twentyten') ); ?></div>