Changeset 6114

Timestamp:

11/02/2016 10:24:30 AM (7 years ago)

Author:

netweb

Message:

Users: Include users closed topic counts in bbp_get_user_topic_count_raw()

This changeset works around an issue where the lack of custom post statuses support upstream in ​#WP12706 prevents us from including users closed topics counts in a users raw topic count. See also ​#meta1870

Props netweb.
Fixes #2978.

Location:

trunk

Files:

• src/includes/users/functions.php (modified) (2 diffs)
• tests/phpunit/testcases/users/functions/counts.php (modified) (1 diff)

trunk/src/includes/users/functions.php

@@ -1817 +1817 @@
     $where  = get_posts_by_author_sql( bbp_get_topic_post_type(), true, $user_id );
     $count  = (int) $bbp_db->get_var( "SELECT COUNT(*) FROM {$bbp_db->posts} {$where}" );
+    // Manually add the user closed topic count, see #2978 and #WP12706
+    $count  = $count + bbp_get_user_closed_topic_count( $user_id );
 
     return (int) apply_filters( 'bbp_get_user_topic_count_raw', $count, $user_id );
@@ -1846 +1848 @@
 
     return (int) apply_filters( 'bbp_get_user_reply_count_raw', $count, $user_id );
+}
+
+/**
+ * Return the raw database count of closed topics by a user
+ *
+ * @since 2.6.0 bbPress (r6113)
+ *
+ * @param int $user_id User ID to get count for
+ *
+ * @return int Raw DB count of user closed topics
+ */
+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( "SELECT COUNT(*)
+        FROM {$bbp_db->posts}
+        WHERE post_type = '" . bbp_get_topic_post_type() . "'
+        AND post_status = '" . bbp_get_closed_status_id() . "'
+        AND post_author = $user_id;"
+    );
+
+    return (int) apply_filters( 'bbp_get_user_closed_topic_count', $count, $user_id );
 }
 

trunk/tests/phpunit/testcases/users/functions/counts.php

@@ -183 +183 @@
         $count = bbp_get_user_topic_count_raw( $u );
         $this->assertSame( 6, $count );
+
+        $t = $this->factory->topic->create( array(
+            'post_author' => $u,
+        ) );
+
+        bbp_close_topic( $t );
+
+        $count = bbp_get_user_topic_count_raw( $u );
+        $this->assertSame( 7, $count );
     }