Ticket #19903: 19903.diff

wp-includes/comment.php

@@ -430 +430 @@
         return $lastcommentmodified;
 }
 
-/**
- * The amount of comments in a post or total comments.
- *
- * A lot like {@link wp_count_comments()}, in that they both return comment
- * stats (albeit with different types). The {@link wp_count_comments()} actual
- * caches, but this function does not.
- *
- * @since 2.0.0
- * @uses $wpdb
- *
- * @param int $post_id Optional. Comment amount in post if > 0, else total comments blog wide.
- * @return array The amount of spam, approved, awaiting moderation, and total comments.
- */
-function get_comment_count( $post_id = 0 ) {
-        global $wpdb;
-
-        $post_id = (int) $post_id;
-
-        $where = '';
-        if ( $post_id > 0 ) {
-                $where = $wpdb->prepare("WHERE comment_post_ID = %d", $post_id);
-        }
-
-        $totals = (array) $wpdb->get_results("
-                SELECT comment_approved, COUNT( * ) AS total
-                FROM {$wpdb->comments}
-                {$where}
-                GROUP BY comment_approved
-        ", ARRAY_A);
-
-        $comment_count = array(
-                "approved"              => 0,
-                "awaiting_moderation"   => 0,
-                "spam"                  => 0,
-                "total_comments"        => 0
-        );
-
-        foreach ( $totals as $row ) {
-                switch ( $row['comment_approved'] ) {
-                        case 'spam':
-                                $comment_count['spam'] = $row['total'];
-                                $comment_count["total_comments"] += $row['total'];
-                                break;
-                        case 1:
-                                $comment_count['approved'] = $row['total'];
-                                $comment_count['total_comments'] += $row['total'];
-                                break;
-                        case 0:
-                                $comment_count['awaiting_moderation'] = $row['total'];
-                                $comment_count['total_comments'] += $row['total'];
-                                break;
-                        default:
-                                break;
-                }
-        }
-
-        return $comment_count;
-}
-
 //
 // Comment meta functions
 //

wp-includes/deprecated.php

@@ -2864 +2864 @@
 
         return is_user_member_of_blog( get_current_user_id(), $blog_id );
 }
+
+/**
+ * The amount of comments in a post or total comments.
+ *
+ * A lot like {@link wp_count_comments()}, in that they both return comment
+ * stats (albeit with different types). The {@link wp_count_comments()} actual
+ * caches, but this function does not.
+ *
+ * @since 2.0.0
+ * @deprecated 3.4
+ * @deprecated Use wp_count_comments()
+ * @uses $wpdb
+ *
+ * @param int $post_id Optional. Comment amount in post if > 0, else total comments blog wide.
+ * @return array The amount of spam, approved, awaiting moderation, and total comments.
+ */
+function get_comment_count( $post_id = 0 ) {
+        _deprecated_function( __FUNCTION__, '3.4', 'wp_count_comments()' );
+        global $wpdb;
+
+        $post_id = (int) $post_id;
+
+        $where = '';
+        if ( $post_id > 0 ) {
+                $where = $wpdb->prepare("WHERE comment_post_ID = %d", $post_id);
+        }
+
+        $totals = (array) $wpdb->get_results("
+                SELECT comment_approved, COUNT( * ) AS total
+                FROM {$wpdb->comments}
+                {$where}
+                GROUP BY comment_approved
+        ", ARRAY_A);
+
+        $comment_count = array(
+                "approved"              => 0,
+                "awaiting_moderation"   => 0,
+                "spam"                  => 0,
+                "total_comments"        => 0
+        );
+
+        foreach ( $totals as $row ) {
+                switch ( $row['comment_approved'] ) {
+                        case 'spam':
+                                $comment_count['spam'] = $row['total'];
+                                $comment_count["total_comments"] += $row['total'];
+                                break;
+                        case 1:
+                                $comment_count['approved'] = $row['total'];
+                                $comment_count['total_comments'] += $row['total'];
+                                break;
+                        case 0:
+                                $comment_count['awaiting_moderation'] = $row['total'];
+                                $comment_count['total_comments'] += $row['total'];
+                                break;
+                        default:
+                                break;
+                }
+        }
+
+        return $comment_count;
+}