Changeset 2806 for branches/plugin/bbp-includes/bbp-forum-template.php

Timestamp:

01/14/2011 07:22:08 PM (16 years ago)

Author:

johnjamesjacoby

Message:

Adjust topic and reply counts up the subforum tree. Fixes #1320. Props GautamGupta

File:

• branches/plugin/bbp-includes/bbp-forum-template.php (modified) (9 diffs)

branches/plugin/bbp-includes/bbp-forum-template.php

@@ -41 +41 @@
 
         // Don't show private forums to normal users
-        if ( !current_user_can( 'read_private_forums' ) && empty( $r['meta_key'] ) && empty( $r['meta_value'] ) && empty( $r['meta_compare'] ) ) {
-                $r['meta_key']     = '_bbp_forum_visibility';
-                $r['meta_value']   = 'public';
-                $r['meta_compare'] = '==';
+        if ( !current_user_can( 'read_private_forums' ) && empty( $r['meta_key'] ) && empty( $r['meta_value'] ) ) {
+                $r['meta_key']   = '_bbp_forum_visibility';
+                $r['meta_value'] = 'public';
         }
 
@@ -435 +434 @@
 
         // Don't show private forums to normal users
-        if ( !current_user_can( 'read_private_forums' ) && empty( $r['meta_key'] ) && empty( $r['meta_value'] ) && empty( $r['meta_compare'] ) ) {
-                $r['meta_key']     = '_bbp_forum_visibility';
-                $r['meta_value']   = 'public';
-                $r['meta_compare'] = '==';
+        if ( !current_user_can( 'read_private_forums' ) && empty( $r['meta_key'] ) && empty( $r['meta_value'] ) ) {
+                $r['meta_key']   = '_bbp_forum_visibility';
+                $r['meta_value'] = 'public';
         }
 
@@ -505 +503 @@
                                 $topic_count = ' (' . bbp_get_forum_topic_count( $sub_forum->ID ) . ')';
 
-                        //if ( !empty( $show_reply_count ) && !bbp_is_forum_category( $sub_forum->ID ) )
-                        //      $reply_count = ' (' . bbp_get_forum_reply_count( $sub_forum->ID ) . ')';
+                        if ( !empty( $show_reply_count ) && !bbp_is_forum_category( $sub_forum->ID ) )
+                                $reply_count = ' (' . bbp_get_forum_reply_count( $sub_forum->ID ) . ')';
 
                         $output .= $link_before . '<a href="' . $permalink . '" class="bbp-forum-link">' . $title . $topic_count . $reply_count . '</a>' . $show_sep . $link_after;
@@ -904 +902 @@
  *
  * @param int $forum_id Optional. Forum id
+ * @param bool $total_count Optional. To get the total count or normal count?
  * @uses bbp_get_forum_topic_count() To get the forum topic count
  */
-function bbp_forum_topic_count( $forum_id = 0 ) {
+function bbp_forum_topic_count( $forum_id = 0, $total_count = true ) {
         echo bbp_get_forum_topic_count( $forum_id );
 }
@@ -915 +914 @@
          *
          * @param int $forum_id Optional. Forum id
+         * @param bool $total_count Optional. To get the total count or normal
+         *                           count?
          * @uses bbp_get_forum_id() To get the forum id
          * @uses get_post_meta() To get the forum topic count
@@ -923 +924 @@
          * @return int Forum topic count
          */
-        function bbp_get_forum_topic_count( $forum_id = 0 ) {
-                $forum_id = bbp_get_forum_id( $forum_id );
-                $topics   = get_post_meta( $forum_id, '_bbp_forum_topic_count', true );
+        function bbp_get_forum_topic_count( $forum_id = 0, $total_count = true ) {
+                $forum_id = bbp_get_forum_id( $forum_id );
+                $topics  = get_post_meta( $forum_id, empty( $total_count ) ? '_bbp_forum_topic_count' : '_bbp_forum_total_topic_count', true );
 
                 if ( '' === $topics )
-                        $topics = bbp_update_forum_topic_count( $forum_id );
+                        $topics = bbp_update_forum_topic_count( $forum_id, $total_count );
 
                 return apply_filters( 'bbp_get_forum_topic_count', (int) $topics, $forum_id );
@@ -939 +940 @@
  *
  * @param int $forum_id Optional. Forum id
+ * @param bool $total_count Optional. To get the total count or normal count?
  * @uses bbp_get_forum_reply_count() To get the forum reply count
  */
-function bbp_forum_reply_count( $forum_id = 0 ) {
-        echo bbp_get_forum_reply_count( $forum_id );
+function bbp_forum_reply_count( $forum_id = 0, $total_count = true ) {
+        echo bbp_get_forum_reply_count( $forum_id, $total_count );
 }
         /**
@@ -950 +952 @@
          *
          * @param int $forum_id Optional. Forum id
+         * @param bool $total_count Optional. To get the total count or normal
+         *                           count?
          * @uses bbp_get_forum_id() To get the forum id
          * @uses get_post_meta() To get the forum reply count
@@ -958 +962 @@
          * @return int Forum reply count
          */
-        function bbp_get_forum_reply_count( $forum_id = 0 ) {
-                $forum_id = bbp_get_forum_id( $forum_id );
-                $replies  = get_post_meta( $forum_id, '_bbp_forum_reply_count', true );
+        function bbp_get_forum_reply_count( $forum_id = 0, $total_count = true ) {
+                $forum_id = bbp_get_forum_id( $forum_id );
+                $replies  = get_post_meta( $forum_id, empty( $total_count ) ? '_bbp_forum_reply_count' : '_bbp_forum_total_reply_count', true );
 
                 if ( '' === $replies )
-                        $replies = bbp_update_forum_reply_count( $forum_id );
+                        $replies = bbp_update_forum_reply_count( $forum_id, $total_count );
 
                 return apply_filters( 'bbp_get_forum_reply_count', (int) $replies, $forum_id );