Changeset 5129

Timestamp:

09/09/2011 03:06:13 PM (13 years ago)

Author:

boonebgorges

Message:

Reworks the way that total topic counts are retrieved on user forum pages. See #3557

Location:

trunk/bp-forums

Files:

• bp-forums-filters.php (modified) (1 diff)
• bp-forums-functions.php (modified) (4 diffs)
• bp-forums-template.php (modified) (1 diff)

trunk/bp-forums/bp-forums-filters.php

@@ -201 +201 @@
     $sql .= $wpdb->prepare( " AND p.poster_id = %s ", bp_displayed_user_id() );
 
+    // Remove any topic_author information
+    $sql = str_replace( " AND t.topic_poster = '" . bp_displayed_user_id() . "'", '', $sql );
+
     return $sql;
 }

trunk/bp-forums/bp-forums-functions.php

@@ -291 +291 @@
 }
 
-function bp_forums_total_topic_count_for_user( $user_id = 0 ) {
+/**
+ * Get a total "Topics Started" count for a given user
+ *
+ * @package BuddyPress
+ *
+ * @param int $user_id ID of the user being queried. Falls back on displayed user, then loggedin
+ * @param str $type The current filter/sort type. 'active', 'popular', 'unreplied'
+ * @return int $count The topic count
+ */
+function bp_forums_total_topic_count_for_user( $user_id = 0, $type = 'active' ) {
     global $bp;
 
@@ -300 +309 @@
 
     if ( class_exists( 'BB_Query' ) ) {
-        $query = new BB_Query( 'topic', array( 'topic_author_id' => $user_id, 'page' => 1, 'per_page' => -1, 'count' => true ) );
+        $args = array(
+            'topic_author_id' => $user_id,
+            'page'        => 1,
+            'per_page'    => -1,
+            'count'       => true
+        );
+
+        if ( 'unreplied' == $type )
+            $args['post_count'] = 1;
+
+        $query = new BB_Query( 'topic', $args );
         $count = $query->count;
         $query = null;
@@ -321 +340 @@
  * @return int $count
  */
-function bp_forums_total_replied_count_for_user( $user_id = 0 ) {
+function bp_forums_total_replied_count_for_user( $user_id = 0, $type = 'active' ) {
     global $bp;
 
@@ -341 +360 @@
                 $topics[] = $result->topic_id;
         }
-        $count = count( $topics );
+
+        // Even more unfortunate. If this is filtered by 'unreplied', we have to requery
+        if ( 'unreplied' == $type ) {
+            $topic_ids = implode( ',', $topics );
+            $topics_query = new BB_Query( 'topic', array( 'topic_id' => $topic_ids, 'page' => 1, 'per_page' => -1, 'post_count' => 1 ) );
+            $count = count( $topics_query->results );
+        } else {
+            $count = count( $topics );
+        }
         $query = null;
     } else {

trunk/bp-forums/bp-forums-template.php

@@ -137 +137 @@
             $this->total_topic_count = 0;
         } else {
+            // Get a total topic count, for use in pagination. This value will differ
+            // depending on scope
             if ( !empty( $forum_id ) ) {
+                // Group forums
                 $topic_count = bp_forums_get_forum( $forum_id );
                 $topic_count = (int)$topic_count->topics;
             } else if ( !empty( $bp->groups->current_group ) ) {
                 $topic_count = (int)groups_total_public_forum_topic_count( $type );
-            } else if ( bp_is_user_forums_started() ) {
-                $topic_count = bp_forums_total_topic_count_for_user( bp_displayed_user_id() );
+            } else if ( bp_is_user_forums_started() || ( bp_is_directory() && $user_id ) ) {
+                // This covers the case of Profile > Forums > Topics Started, as
+                // well as Forum Directory > My Topics
+                $topic_count = bp_forums_total_topic_count_for_user( bp_displayed_user_id(), $type );
             } else if ( bp_is_user_forums_replied_to() ) {
-                $topic_count = bp_forums_total_replied_count_for_user( bp_displayed_user_id() );
+                // Profile > Forums > Replied To
+                $topic_count = bp_forums_total_replied_count_for_user( bp_displayed_user_id(), $type );
             } else {
-                // For forum directories, get a true count
+                // For forum directories (All Topics), get a true count
                 $status = is_super_admin() ? 'all' : 'public'; // todo: member-of
                 $topic_count = (int)groups_total_forum_topic_count( $status, $search_terms );