[wp-cvs] wordpress/wp-includes template-functions-comment.php, 1.23, 1.24

[Matthew Mullenweg]

Update of /cvsroot/cafelog/wordpress/wp-includes
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25507/wp-includes

Modified Files:
	template-functions-comment.php 
Log Message:
Needs to be inside of conditional.

Index: template-functions-comment.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-comment.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** template-functions-comment.php	10 Jun 2004 08:40:58 -0000	1.23
--- template-functions-comment.php	10 Jun 2004 09:17:41 -0000	1.24
***************
*** 20,32 ****
  	global $withcomments, $single, $post, $wpdb, $id, $comment, $cookiehash;
  
! 	$req = get_settings('require_name_email');
! 	$comment_author = isset($_COOKIE['comment_author_'.$cookiehash]) ? trim($_COOKIE['comment_author_'.$cookiehash]) : '';
! 	$comment_author_email = isset($_COOKIE['comment_author_email_'.$cookiehash]) ? trim($_COOKIE['comment_author_email_'.$cookiehash]) : '';
! 	$comment_author_url = isset($_COOKIE['comment_author_url_'.$cookiehash]) ? trim($_COOKIE['comment_author_url_'.$cookiehash]) : '';
! 
! 	$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
! 
! 	if ( $single || $withcomments )
  		include(ABSPATH . 'wp-comments.php');
  }
  
--- 20,31 ----
  	global $withcomments, $single, $post, $wpdb, $id, $comment, $cookiehash;
  
! 	if ( $single || $withcomments ) :
! 		$req = get_settings('require_name_email');
! 		$comment_author = isset($_COOKIE['comment_author_'.$cookiehash]) ? trim($_COOKIE['comment_author_'.$cookiehash]) : '';
! 		$comment_author_email = isset($_COOKIE['comment_author_email_'.$cookiehash]) ? trim($_COOKIE['comment_author_email_'.$cookiehash]) : '';
! 		$comment_author_url = isset($_COOKIE['comment_author_url_'.$cookiehash]) ? trim($_COOKIE['comment_author_url_'.$cookiehash]) : '';
! 		$comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
  		include(ABSPATH . 'wp-comments.php');
+ 	endif;
  }