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

Timestamp:

01/24/2011 02:22:26 PM (15 years ago)

Author:

johnjamesjacoby

Message:

Fix bug where group topic template was not loading. Use new action/component api.

File:

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

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

@@ -886 +886 @@
     extract( $r, EXTR_SKIP );
 
-    if ( !$topic_id && $bp->current_component == $bp->groups->slug && 'forum' == $bp->current_action && 'topic' == $bp->action_variables[0] )
+    if ( empty( $topic_id ) && bp_is_current_component( 'groups') && bp_is_current_action( 'forum' ) && 'topic' == $bp->action_variables[0] )
         $topic_id = bp_forums_get_topic_id_from_slug( $bp->action_variables[1] );
 
@@ -893 +893 @@
 
         // Current topic forum_id needs to match current_group forum_id
-        if ( $bp->current_component == $bp->groups->slug && $topic_template->forum_id != groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ) )
+        if ( bp_is_current_component( 'groups' ) && $topic_template->forum_id != groups_get_groupmeta( $bp->groups->current_group->id, 'forum_id' ) )
             return false;