Changeset 1398

Timestamp:

06/10/2004 07:42:48 AM (22 years ago)

Author:

saxmatt

Message:

Move comments include into function.

Location:

trunk

Files:

• index.php (modified) (2 diffs)
• wp-comments.php (modified) (2 diffs)
• wp-includes/template-functions-comment.php (modified) (1 diff)

trunk/index.php

@@ -38 +38 @@
 <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="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 +53 @@
     -->
 
-<?php include(ABSPATH . 'wp-comments.php'); ?>
 </div>
+
+<?php comments_template(); // Get wp-comments.php template ?>
 
 <?php endforeach; else: ?>

trunk/wp-comments.php

@@ -18 +18 @@
         $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");
+        $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
 ?>
 
@@ -33 +33 @@
 
 
-<?php if ($comments) { ?>
+<?php if ($comments) { ;?>
+
 <ol id="commentlist">
 <?php foreach ($comments as $comment) { ?>

trunk/wp-includes/template-functions-comment.php

@@ -16 +16 @@
 
 add_filter('comment_excerpt', 'convert_chars');
+
+function comments_template() {
+    global $withcomments, $single, $post, $wpdb, $id, $comment;
+    if ( $single || $withcomments )
+        include(ABSPATH . 'wp-comments.php');
+}
 
 function clean_url($url) {