Changeset 5861

Timestamp:

09/03/2017 09:58:57 AM (9 years ago)

Author:

SergeyBiryukov

Message:

Support Theme: Use the methods added in [5860] in wporg_support_get_user_topics_count() and wporg_support_get_user_reviews_count().

See #2967, #2772.

File:

• sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-support/functions.php (modified) (2 diffs)

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

@@ -232 +232 @@
  * 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;
+        $plugin_instance = WordPressdotorg\Forums\Plugin::get_instance();
+
+        return $plugin_instance->users->get_user_topics_count( $user_id );
 }
 
 /**
  * Return the raw database count of reviews by a user.
- *
- * @global wpdb $wpdb WordPress database abstraction object.
  *
  * @param int $user_id User ID to get count for.
@@ -272 +252 @@
  */
 function wporg_support_get_user_reviews_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;
+        $plugin_instance = WordPressdotorg\Forums\Plugin::get_instance();
+
+        return $plugin_instance->users->get_user_reviews_count( $user_id );
 }