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

[Matthew Mullenweg]

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

Modified Files:
	template-functions-comment.php 
Log Message:
More comments and comment template improvements. TODO: popup comment template

Index: template-functions-comment.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-includes/template-functions-comment.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** template-functions-comment.php	10 Jun 2004 07:42:48 -0000	1.22
--- template-functions-comment.php	10 Jun 2004 08:40:58 -0000	1.23
***************
*** 18,22 ****
  
  function comments_template() {
! 	global $withcomments, $single, $post, $wpdb, $id, $comment;
  	if ( $single || $withcomments )
  		include(ABSPATH . 'wp-comments.php');
--- 18,30 ----
  
  function comments_template() {
! 	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');
***************
*** 302,304 ****
--- 310,324 ----
  }
  
+ function comments_open() {
+ 	global $post;
+ 	if ('open' == $post->comment_status) return true;
+ 	else return false;
+ }
+ 
+ function pings_open() {
+ 	global $post;
+ 	if ('open' == $post->ping_status) return true;
+ 	else return false;
+ }
+ 
  ?>
\ No newline at end of file