Changeset 6609 for trunk/src/includes/users/functions.php

Timestamp:

07/03/2017 11:22:01 PM (7 years ago)

Author:

johnjamesjacoby

Message:

Counts: Remove count_user_posts() usages, and always return an int.

User topic & reply counts haven't included closed status for topics, and these wrappers should include support for things like view=all later.

Fixes #3124.

File:

• trunk/src/includes/users/functions.php (modified) (3 diffs)

trunk/src/includes/users/functions.php

@@ -621 +621 @@
 function bbp_get_user_topic_count_raw( $user_id = 0 ) {
     $user_id = bbp_get_user_id( $user_id );
-    if ( empty( $user_id ) ) {
-        return false;
-    }
-
-    $count = count_user_posts( $user_id, bbp_get_topic_post_type(), false );
-    // Manually add the user closed topic count, see #2978 and #WP12706
-    $count = $count + bbp_get_user_closed_topic_count( $user_id );
+    $bbp_db  = bbp_db();
+    $statii  = "'" . implode( "', '", bbp_get_public_topic_statuses() ) . "'";
+    $sql     = "SELECT COUNT(*)
+            FROM {$bbp_db->posts}
+            WHERE post_author = %d
+                AND post_type = %s
+                AND post_status IN ({$statii})";
+
+    $query   = $bbp_db->prepare( $sql, $user_id, bbp_get_topic_post_type() );
+    $count   = (int) $bbp_db->get_var( $query );
 
     // Filter & return
@@ -644 +647 @@
 function bbp_get_user_reply_count_raw( $user_id = 0 ) {
     $user_id = bbp_get_user_id( $user_id );
-    if ( empty( $user_id ) ) {
-        return false;
-    }
-
-    $count = count_user_posts( $user_id, bbp_get_reply_post_type(), false );
+    $bbp_db  = bbp_db();
+    $sql     = "SELECT COUNT(*)
+            FROM {$bbp_db->posts}
+            WHERE post_author = %d
+                AND post_type = %s
+                AND post_status %s";
+
+    $query   = $bbp_db->prepare( $sql, $user_id, bbp_get_reply_post_type(), bbp_get_public_status_id() );
+    $count   = (int) $bbp_db->get_var( $query );
 
     // Filter & return
@@ -665 +672 @@
 function bbp_get_user_closed_topic_count( $user_id = 0 ) {
     $user_id = bbp_get_user_id( $user_id );
-    if ( empty( $user_id ) ) {
-        return false;
-    }
-
-    $bbp_db = bbp_db();
-    $count  = (int) $bbp_db->get_var( $bbp_db->prepare(
+    $bbp_db  = bbp_db();
+    $count   = (int) $bbp_db->get_var( $bbp_db->prepare(
         "SELECT COUNT(*)
             FROM {$bbp_db->posts}