Changeset 4010

Timestamp:

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

Author:

johnjamesjacoby

Message:

Continued separation of forums and groups components.

Location:

trunk/bp-forums

Files:

• bp-forums-functions.php (modified) (1 diff)
• bp-forums-screens.php (modified) (1 diff)
• bp-forums-template.php (modified) (5 diffs)

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 {

trunk/bp-forums/bp-forums-screens.php

@@ -72 +72 @@
         global $bp;
 
+        if ( !bp_is_forums_component() || !bp_is_current_action( 'topic' ) || empty( $bp->action_variables[0] ) )
+                return false;
+
         do_action( 'bp_forums_screen_replies' );
 
-        bp_core_load_template( apply_filters( 'bp_forums_screen_replies', 'members/single/home' ) );
+        bp_core_load_template( apply_filters( 'bp_forums_screen_replies', 'forums/single/topic' ) );
 }
+add_action( 'bp_screens', 'bp_forums_screen_replies' );
 
 function bp_forums_screen_favorites() {

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

@@ -335 +335 @@
 
                 $defaults = array(
-                        'type' => 'thumb',
-                        'width' => false,
+                        'type'   => 'thumb',
+                        'width'  => false,
                         'height' => false,
-                        'alt' => __( 'Profile picture of %s', 'buddypress' )
+                        'alt'    => __( 'Profile picture of %s', 'buddypress' )
                 );
 
@@ -376 +376 @@
                 global $forum_template;
 
-                return apply_filters( 'bp_get_the_topic_object_name', $forum_template->topic->object_name );
+                if ( isset( $forum_template->topic->object_name ) )
+                        $retval = $forum_template->topic->object_name;
+                else
+                        $retval = '';
+
+                return apply_filters( 'bp_get_the_topic_object_name', $retval );
         }
 
@@ -394 +399 @@
                 global $bp, $forum_template;
 
-                /* Currently this will only work with group forums, extended support in the future */
-                return apply_filters( 'bp_get_the_topic_object_permalink', bp_get_root_domain() . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug . '/forum/' );
+                // Currently this will only work with group forums, extended support in the future
+                if ( bp_is_active( 'groups' ) )
+                        $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $forum_template->topic->object_slug . '/forum/' );
+                else
+                        $permalink = '';
+
+                return apply_filters( 'bp_get_the_topic_object_permalink', $permalink );
         }
 
@@ -416 +426 @@
                 global $forum_template;
 
+                if ( !isset( $forum_template->topic->object_id ) )
+                        return false;
+
                 $defaults = array(
-                        'type' => 'thumb',
-                        'width' => false,
+                        'type'   => 'thumb',
+                        'width'  => false,
                         'height' => false,
-                        'alt' => __( 'Group logo for %s', 'buddypress' )
+                        'alt'    => __( 'Group logo for %s', 'buddypress' )
                 );
 
@@ -547 +560 @@
                 global $forum_template, $bp;
 
-                if ( !empty( $forum_template->topic->object_slug ) )
-                        $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug );
-                else if ( !empty( $bp->is_single_item ) )
-                        $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . bp_current_item() );
+                if ( bp_is_active( 'groups' ) && !empty( $forum_template->topic->object_slug ) )
+                        $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $forum_template->topic->object_slug . '/forum' );
+                else if ( bp_is_single_item() )
+                        $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/' . bp_current_item() );
                 else
-                        $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_action );
-
-                return apply_filters( 'bp_get_the_topic_permalink', trailingslashit( $permalink . 'forum/topic/' . $forum_template->topic->topic_slug ) );
+                        $permalink = trailingslashit( bp_get_root_domain() . '/' . bp_get_forums_root_slug() . '/' . $bp->current_action );
+
+                return apply_filters( 'bp_get_the_topic_permalink', trailingslashit( $permalink . 'topic/' . $forum_template->topic->topic_slug ) );
         }