Changeset 546 for trunk/b2-include/b2template.functions.php

Timestamp:

11/12/2003 03:22:47 PM (22 years ago)

Author:

emc3

Message:

otaku42's comment moderation patches

File:

• trunk/b2-include/b2template.functions.php (modified) (2 diffs)

trunk/b2-include/b2template.functions.php

@@ -1404 +1404 @@
 // generic comments/trackbacks/pingbacks numbering
 
-function comments_number($zero='No Comments', $one='1 Comment', $more='% Comments') {
+function comments_number($zero='No Comments', $one='1 Comment', $more='% Comments', $include_unapproved = false) {
     global $id, $comment, $tablecomments, $querycount, $wpdb;
-    $number = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id");
+    $query = "SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = '$id'";
+    if (false == $include_unapproved) {
+        $query .= " AND comment_approved = '1'";
+    }
+    $number = $wpdb->get_var($query);
     if ($number == 0) {
         $blah = $zero;
@@ -1437 +1441 @@
     global $id, $b2commentspopupfile, $b2commentsjavascript, $post, $wpdb, $tablecomments, $HTTP_COOKIE_VARS, $cookiehash;
     global $querystring_start, $querystring_equal, $querystring_separator, $siteurl;
-    $number = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id");
+    $number = $wpdb->get_var("SELECT COUNT(*) FROM $tablecomments WHERE comment_post_ID = $id AND comment_approved = '1'");
     if (0 == $number && 'closed' == $post->comment_status) {
         echo $none;