Changeset 5629

Timestamp:

07/07/2017 08:12:06 PM (7 years ago)

Author:

SergeyBiryukov

Message:

Support Theme: Introduce a function to count user's topics, excluding reviews.

The previous method of substracting the number of reviews from the total number of topics in [5617] was not really accurate and could sometimes result in a negative number.

See #2772.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support

Files:

• bbpress/user-profile.php (modified) (2 diffs)
• functions.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/bbpress/user-profile.php

@@ -116 +116 @@
 
         <p class="bbp-user-topic-count"><?php
-            $review_count = wporg_support_get_user_review_count();
-
             /* translators: %s: number of user's topics */
-            printf( esc_html__( 'Topics Started: %s', 'wporg-forums' ), number_format_i18n( bbp_get_user_topic_count_raw() - $review_count ) );
+            printf( esc_html__( 'Topics Started: %s', 'wporg-forums' ), number_format_i18n( wporg_support_get_user_topics_count() ) );
         ?></p>
 
@@ -129 +127 @@
         <p class="bbp-user-review-count"><?php
             /* translators: %s: number of user's reviews */
-            printf( esc_html__( 'Reviews Written: %s', 'wporg-forums' ), number_format_i18n( $review_count ) );
+            printf( esc_html__( 'Reviews Written: %s', 'wporg-forums' ), number_format_i18n( wporg_support_get_user_reviews_count() ) );
         ?></p>
     </div>

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php

@@ -215 +215 @@
 
 /**
+ * Return the raw database count of topics by a user, excluding reviews.
+ *
+ * @global wpdb $wpdb WordPress database abstraction object.
+ *
+ * @param int $user_id User ID to get count for.
+ * @return int Raw DB count of topics.
+ */
+function wporg_support_get_user_topics_count( $user_id = 0 ) {
+    global $wpdb;
+
+    $user_id = bbp_get_user_id( $user_id );
+    if ( empty( $user_id ) ) {
+        return 0;
+    }
+
+    if ( ! class_exists( 'WordPressdotorg\Forums\Plugin' ) ) {
+        return 0;
+    }
+
+    $count = (int) $wpdb->get_var( $wpdb->prepare(
+        "SELECT COUNT(*)
+            FROM {$wpdb->posts}
+            WHERE post_type = 'topic'
+                AND post_status IN ( 'publish', 'closed' )
+                AND post_parent <> %d
+                AND post_author = %d",
+        WordPressdotorg\Forums\Plugin::REVIEWS_FORUM_ID,
+        $user_id
+    ) );
+
+    return $count;
+}
+
+/**
  * Return the raw database count of reviews by a user.
  *
@@ -222 +256 @@
  * @return int Raw DB count of reviews.
  */
-function wporg_support_get_user_review_count( $user_id = 0 ) {
+function wporg_support_get_user_reviews_count( $user_id = 0 ) {
     global $wpdb;