Changeset 4010 for trunk/bp-forums/bp-forums-functions.php

Timestamp:

02/02/2011 07:37:25 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Continued separation of forums and groups components.

File:

• trunk/bp-forums/bp-forums-functions.php (modified) (1 diff)

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

@@ -268 +268 @@
 
     if ( isset( $bbdb ) ) {
-        $count = $bbdb->get_results( $bbdb->prepare( "SELECT t.topic_id FROM {$bbdb->topics} AS t". groups_add_forum_tables_sql( '' ) . " WHERE " . groups_add_forum_where_sql( "t.topic_status = 0" ) ) );
+        if ( bp_is_active( 'groups' ) ) {
+            $groups_table_sql = groups_add_forum_tables_sql();
+            $groups_where_sql = groups_add_forum_where_sql( "t.topic_status = 0" );
+        } else {
+            $groups_table_sql = '';
+            $groups_where_sql = "t.topic_status = 0";
+        }
+        $count = $bbdb->get_results( $bbdb->prepare( "SELECT t.topic_id FROM {$bbdb->topics} AS t {$groups_table_sql} WHERE {$groups_where_sql}" ) );
         $count = count( (array)$count );
     } else {