Changeset 3933 for trunk/bp-forums/bp-forums-template.php

Timestamp:

01/26/2011 03:28:35 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Introduce Forums tab to user account area, to show topics the user has started, topics the user has replied to, and favorite forum topics. This includes additional template files in bp-default to support new functionality, and edits to the forum_sql filter functions.

File:

• trunk/bp-forums/bp-forums-template.php (modified) (3 diffs)

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

@@ -102 +102 @@
             $this->total_topic_count = 0;
         } else {
-            if ( $forum_id ) {
+            if ( !empty( $forum_id ) ) {
                 $topic_count = bp_forums_get_forum( $forum_id );
                 $topic_count = (int)$topic_count->topics;
-            } else if ( function_exists( 'groups_total_public_forum_topic_count' ) ) {
+            } else if ( !empty( $bp->groups->current_group ) ) {
                 $topic_count = (int)groups_total_public_forum_topic_count( $type );
             } else {
@@ -217 +217 @@
      * pass their parameters directly to the loop.
      */
-    $type = 'newest';
-    $user_id = 0;
-    $forum_id = false;
+    $type         = 'newest';
+    $user_id      = 0;
+    $forum_id     = false;
     $search_terms = false;
-    $no_stickies = 'all';
+    $no_stickies  = 'all';
 
     // User filtering
@@ -732 +732 @@
         global $bp, $forum_template;
 
-        $start_num = intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1;
-        $from_num = bp_core_number_format( $start_num );
-        $to_num = bp_core_number_format( ( $start_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $start_num + ( $forum_template->pag_num - 1 ) );
-        $total = bp_core_number_format( $forum_template->total_topic_count );
-
+        $start_num  = intval( ( $forum_template->pag_page - 1 ) * $forum_template->pag_num ) + 1;
+        $from_num   = bp_core_number_format( $start_num );
+        $to_num     = bp_core_number_format( ( $start_num + ( $forum_template->pag_num - 1  ) > $forum_template->total_topic_count ) ? $forum_template->total_topic_count : $start_num + ( $forum_template->pag_num - 1 ) );
+        $total      = bp_core_number_format( $forum_template->total_topic_count );
         $pag_filter = false;
+
         if ( 'tags' == $forum_template->type && !empty( $forum_template->search_terms ) )
             $pag_filter = sprintf( __( ' matching tag "%s"', 'buddypress' ), $forum_template->search_terms );