Changeset 2740

Timestamp:

02/18/2010 04:46:00 PM (16 years ago)

Author:

apeatling

Message:

Fixes #1997

Location:

trunk

Files:

• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-themes/bp-default/groups/single/home.php (modified) (2 diffs)

trunk/bp-core/bp-core-templatetags.php

@@ -1591 +1591 @@
 }
 
+function bp_is_group_activity() {
+    global $bp;
+
+    if ( BP_GROUPS_SLUG == $bp->current_component && $bp->is_single_item && 'activity' == $bp->current_action )
+        return true;
+
+    return false;
+}
+
 function bp_is_group_forum_topic() {
     global $bp;

trunk/bp-themes/bp-default/groups/single/home.php

@@ -39 +39 @@
                     <?php locate_template( array( 'groups/single/request-membership.php' ), true ) ?>
 
-                <?php elseif ( bp_group_is_visible() ) : ?>
+                <?php elseif ( bp_group_is_visible() && bp_is_active( 'activity' ) ) : ?>
                     <?php locate_template( array( 'groups/single/activity.php' ), true ) ?>
 
-                <?php else : ?>
+                <?php elseif ( !bp_group_is_visible() ) : ?>
                     <?php /* The group is not visible, show the status message */ ?>
 
@@ -52 +52 @@
 
                     <?php do_action( 'bp_after_group_status_message' ) ?>
+
+                <?php else : ?>
+                    <?php
+                        /* If nothing sticks, just load a group front template if one exists. */
+                        locate_template( array( 'groups/single/front.php' ), true );
+                    ?>
                 <?php endif; ?>