Changeset 1726 for trunk/wp-includes/template-functions-comment.php

Timestamp:

09/30/2004 05:56:16 PM (22 years ago)

Author:

rboren

Message:

Introduce get_template_directory() and bloginfo('stylesheet_directory'). Make comments_popup_script() theme aware.

File:

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

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

@@ -27 +27 @@
                 $comments = $wpdb->get_results("SELECT * FROM $wpdb->comments WHERE comment_post_ID = '$post->ID' AND comment_approved = '1' ORDER BY comment_date");
 
-                $wp_template = get_settings('template');
-                if ($wp_template == 'default') {
-                        $wp_template = '';
-                } else {
-                        $wp_template = ABSPATH . "wp-content/themes/$wp_template/comments.php";
-                } 
-
-                if(! empty($wp_template) && file_exists($wp_template)) {
-                        include($wp_template);
+                $template = get_template_directory();
+                $template .= "/comments.php";
+
+                if (file_exists($template)) {
+                        include($template);
                 }       else {
                         include(ABSPATH . 'wp-comments.php');
@@ -76 +72 @@
 function comments_popup_script($width=400, $height=400, $file='wp-comments-popup.php') {
     global $wpcommentspopupfile, $wptrackbackpopupfile, $wppingbackpopupfile, $wpcommentsjavascript;
-    $wpcommentspopupfile = $file;
+
+                if (empty ($file)) {
+                        $template = get_template_directory();
+                        $template .= '/comments-popup.php';
+                        if (file_exists($template)) {
+                                $wpcommentspopupfile = $template;
+                        } else {
+                                $wpcommentspopupfile = 'wp-comments-popup.php';
+                        }
+                } else {
+                        $wpcommentspopupfile = $file;
+                }
+
     $wpcommentsjavascript = 1;
     $javascript = "<script type=\"text/javascript\">\nfunction wpopen (macagna) {\n    window.open(macagna, '_blank', 'width=$width,height=$height,scrollbars=yes,status=yes');\n}\n</script>\n";