Changeset 2009 for trunk/wp-includes/comment-functions.php

Timestamp:

12/30/2004 10:58:06 AM (21 years ago)

Author:

saxmatt

Message:

Moving default template stuff into wp-includes, uncluttering root

File:

• trunk/wp-includes/comment-functions.php (modified) (3 diffs)

trunk/wp-includes/comment-functions.php

@@ -3 +3 @@
 // Template functions
 
-function comments_template() {
-    global $withcomments, $post, $wpdb, $id, $comment;
+function comments_template( $show ) {
+    global $wp_query, $withcomments, $post, $wpdb, $id, $comment;
 
     if ( is_single() || is_page() || $withcomments ) :
@@ -13 +13 @@
         $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
 
-        $template = get_template_directory();
-        $template .= "/comments.php";
-
-        if (file_exists($template)) {
-            include($template);
-        }   else {
-            include(ABSPATH . 'wp-comments.php');
-        }
+    if ( file_exists( TEMPLATEPATH . '/comments.php') )
+        require( TEMPLATEPATH . '/comments.php');
+    else
+        require( ABSPATH . 'wp-includes/wp-comments.php');
 
     endif;
@@ -73 +69 @@
 
         if (empty ($file)) {
-            $template = TEMPLATEPATH . '/comments-popup.php';
-            if (file_exists($template)) {
-                $wpcommentspopupfile = str_replace(ABSPATH, '', $template);
-            } else {
-                $wpcommentspopupfile = 'wp-comments-popup.php';
-            }
+            if ( file_exists( TEMPLATEPATH . '/comments-popup.php') )
+                require( TEMPLATEPATH . '/comments-popup.php');
+            else
+                require( ABSPATH . 'wp-includes/wp-comments-popup.php');
         } else {
             $wpcommentspopupfile = $file;