Changeset 5047

Timestamp:

08/29/2011 10:43:45 PM (13 years ago)

Author:

boonebgorges

Message:

Fixes total found topic count for Started Topics and Replied To tabs on user profiles. Adds template tags to check whether you're looking at Started Topics or Replied To. Fixes class name in members/single/forums.php so that AJAX pagination works correctly. Fixes #3431

Location:

trunk

Files:

• bp-core/bp-core-template.php (modified) (1 diff)
• bp-forums/bp-forums-functions.php (modified) (1 diff)
• bp-forums/bp-forums-template.php (modified) (1 diff)
• bp-themes/bp-default/forums/index.php (modified) (2 diffs)
• bp-themes/bp-default/members/single/forums.php (modified) (1 diff)

trunk/bp-core/bp-core-template.php

@@ -1135 +1135 @@
 }
 
+/**
+ * Is this a user's forums page?
+ *
+ * @package BuddyPress
+ *
+ * @return bool
+ */
 function bp_is_user_forums() {
-    global $bp;
-
     if ( bp_is_current_component( 'forums' ) )
+        return true;
+
+    return false;
+}
+
+/**
+ * Is this a user's "Topics Started" page?
+ *
+ * @package BuddyPress
+ * @since 1.5
+ *
+ * @return bool
+ */
+function bp_is_user_forums_started() {
+    if ( bp_is_current_component( 'forums' ) && bp_is_current_action( 'topics' ) )
+        return true;
+
+    return false;
+}
+
+/**
+ * Is this a user's "Replied To" page?
+ *
+ * @package BuddyPress
+ * @since 1.5
+ *
+ * @return bool
+ */
+function bp_is_user_forums_replied_to() {
+    if ( bp_is_current_component( 'forums' ) && bp_is_current_action( 'replies' ) )
         return true;
 

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

@@ -310 +310 @@
 }
 
+/**
+ * Return the total number of topics replied to by a given user
+ *
+ * Uses an unfortunate technique to count unique topics, due to limitations in BB_Query.
+ *
+ * @package BuddyPress
+ * @since 1.5
+ *
+ * @param int $user_id Defaults to displayed user, then to logged-in user
+ * @return int $count
+ */
+function bp_forums_total_replied_count_for_user( $user_id = 0 ) {
+    global $bp;
+
+    do_action( 'bbpress_init' );
+
+    if ( !$user_id )
+        $user_id = ( bp_displayed_user_id() ) ? bp_displayed_user_id() : bp_loggedin_user_id();
+
+    if ( !$user_id )
+        return 0;
+
+    if ( class_exists( 'BB_Query' ) ) {
+        $query = new BB_Query( 'post', array( 'post_author_id' => $user_id, 'page' => 1, 'per_page' => -1, 'count' => true ) );
+
+        // Count the unique topics. No better way to do this in the bbPress query API
+        $topics = array();
+        foreach( $query->results as $result ) {
+            if ( !in_array( $result->topic_id, $topics ) )
+                $topics[] = $result->topic_id;
+        }
+        $count = count( $topics );
+        $query = null;
+    } else {
+        $count = 0;
+    }
+
+    return apply_filters( 'bp_forums_total_replied_count_for_user', $count, $user_id );
+}
+
 function bp_forums_get_topic_extras( $topics ) {
     global $bp, $wpdb, $bbdb;

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

@@ -142 +142 @@
             } 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_replied_to() ) {
+                $topic_count = bp_forums_total_replied_count_for_user( bp_displayed_user_id() );
             } else {
                 // For forum directories, get a true count

trunk/bp-themes/bp-default/forums/index.php

@@ -8 +8 @@
  */
 
-?>
+?>htnshtsn
 
 <?php get_header( 'buddypress' ); ?>
@@ -151 +151 @@
                 <?php endif; ?>
             </div><!-- #new-topic-post -->
-            
+
             <?php do_action( 'bp_after_new_topic_form' ); ?>
-            
+
             <?php do_action( 'bp_after_directory_forums_content' ); ?>
 

trunk/bp-themes/bp-default/members/single/forums.php

@@ -37 +37 @@
     do_action( 'bp_before_member_forums_content' ); ?>
 
-    <div class="groups mygroups">
+    <div class="forums myforums">
 
         <?php locate_template( array( 'forums/forums-loop.php' ), true ); ?>