Changeset 4787

Timestamp:

07/22/2011 12:40:24 PM (14 years ago)

Author:

boonebgorges

Message:

Ensure that total forum count is correct when a search term is passed to the topic loop

Location:

trunk

Files:

• bp-forums/bp-forums-template.php (modified) (1 diff)
• bp-groups/bp-groups-classes.php (modified) (2 diffs)
• bp-groups/bp-groups-forums.php (modified) (1 diff)

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

@@ -143 +143 @@
                 // For forum directories, get a true count
                 $status = is_super_admin() ? 'all' : 'public'; // todo: member-of
-                $topic_count = (int)groups_total_forum_topic_count( $status );
+                $topic_count = (int)groups_total_forum_topic_count( $status, $search_terms );
             }
 

trunk/bp-groups/bp-groups-classes.php

@@ -607 +607 @@
      * @return int The topic count
      */
-    function get_global_topic_count( $status = 'public' ) {
+    function get_global_topic_count( $status = 'public', $search_terms = false ) {
         global $bbdb, $wpdb, $bp;
         
@@ -629 +629 @@
         }
         
-        return $wpdb->get_var( "SELECT COUNT(t.topic_id) FROM {$bbdb->topics} AS t INNER JOIN {$bp->groups->table_name_groupmeta} AS gm ON t.forum_id = gm.meta_value INNER JOIN {$bp->groups->table_name} AS g ON gm.group_id = g.id WHERE gm.meta_key = 'forum_id' {$status_sql} AND t.topic_status = '0' AND t.topic_sticky != '2' " );
+        $sql = array();
+        
+        $sql['select'] = "SELECT COUNT(t.topic_id)";
+        
+        $sql['from'] = "FROM {$bbdb->topics} AS t INNER JOIN {$bp->groups->table_name_groupmeta} AS gm ON t.forum_id = gm.meta_value INNER JOIN {$bp->groups->table_name} AS g ON gm.group_id = g.id";
+        
+        $sql['where'] = "WHERE gm.meta_key = 'forum_id' {$status_sql} AND t.topic_status = '0' AND t.topic_sticky != '2'";
+        
+        if ( $search_terms ) {
+            $st = like_escape( $search_terms );
+            $sql['where'] .= " AND (  t.topic_title LIKE '%{$st}%' )";
+        }
+        
+        return $wpdb->get_var( implode( ' ', $sql ) );
     }
 }

trunk/bp-groups/bp-groups-forums.php

@@ -258 +258 @@
  * @return int The topic count
  */
-function groups_total_forum_topic_count( $status = 'public' ) {
-    return apply_filters( 'groups_total_forum_topic_count', BP_Groups_Group::get_global_topic_count( $status ) );
+function groups_total_forum_topic_count( $status = 'public', $search_terms = false ) {
+    return apply_filters( 'groups_total_forum_topic_count', BP_Groups_Group::get_global_topic_count( $status, $search_terms ) );
 }