[wp-cvs] wordpress index.php,1.74,1.75 wp-comments.php,1.18,1.19

[Matthew Mullenweg]

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

Modified Files:
	index.php wp-comments.php 
Log Message:
Move comments include into function.

Index: wp-comments.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/wp-comments.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wp-comments.php	24 May 2004 08:22:18 -0000	1.18
--- wp-comments.php	10 Jun 2004 07:42:48 -0000	1.19
***************
*** 18,22 ****
   		$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 = '$id' AND comment_approved = '1' ORDER BY comment_date");
  ?>
  
--- 18,22 ----
   		$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");
  ?>
  
***************
*** 33,37 ****
  
  
! <?php if ($comments) { ?>
  <ol id="commentlist">
  <?php foreach ($comments as $comment) { ?>
--- 33,38 ----
  
  
! <?php if ($comments) { ;?>
! 
  <ol id="commentlist">
  <?php foreach ($comments as $comment) { ?>

Index: index.php
===================================================================
RCS file: /cvsroot/cafelog/wordpress/index.php,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** index.php	6 Jun 2004 15:39:23 -0000	1.74
--- index.php	10 Jun 2004 07:42:48 -0000	1.75
***************
*** 38,42 ****
  <div class="post">
  	 <h3 class="storytitle" id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h3>
! 	<div class="meta"><?php _e("Filed under:"); ?> <?php the_category() ?> &#8212; <?php the_author() ?> @ <?php the_time() ?> <?php edit_post_link(__('Edit This')); ?></div>
  	
  	<div class="storycontent">
--- 38,42 ----
  <div class="post">
  	 <h3 class="storytitle" id="post-<?php the_ID(); ?>"><a href="<?php the_permalink() ?>" rel="bookmark" title="Permanent Link: <?php the_title(); ?>"><?php the_title(); ?></a></h3>
! 	<div class="meta"><?php _e("Filed under:"); ?> <?php the_category(',') ?> &#8212; <?php the_author() ?> @ <?php the_time() ?> <?php edit_post_link(__('Edit This')); ?></div>
  	
  	<div class="storycontent">
***************
*** 53,59 ****
  	-->
  
- <?php include(ABSPATH . 'wp-comments.php'); ?>
  </div>
  
  <?php endforeach; else: ?>
  <p><?php _e('Sorry, no posts matched your criteria.'); ?></p>
--- 53,60 ----
  	-->
  
  </div>
  
+ <?php comments_template(); // Get wp-comments.php template ?>
+ 
  <?php endforeach; else: ?>
  <p><?php _e('Sorry, no posts matched your criteria.'); ?></p>