Ticket #1997: activity-disabled.patch

bp-core/bp-core-templatetags.php

@@ -1590 +1590 @@
         return false;
 }
 
+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;
 

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

@@ -23 +23 @@
                         <div id="item-body">
                                 <?php do_action( 'bp_before_group_body' ) ?>
 
-                                <?php if ( bp_is_group_admin_page() && bp_group_is_visible() ) : ?>
-                                        <?php locate_template( array( 'groups/single/admin.php' ), true ) ?>
+                                <?php if ( bp_group_is_visible() ) : ?>
 
-                                <?php elseif ( bp_is_group_members() && bp_group_is_visible() ) : ?>
-                                        <?php locate_template( array( 'groups/single/members.php' ), true ) ?>
+                                        <?php if ( bp_is_group_admin_page() ) : ?>
+                                                <?php locate_template( array( 'groups/single/admin.php' ), true ) ?>
 
-                                <?php elseif ( bp_is_group_invites() && bp_group_is_visible() ) : ?>
-                                        <?php locate_template( array( 'groups/single/send-invites.php' ), true ) ?>
+                                        <?php elseif ( bp_is_group_home() ) : ?>
 
-                                <?php elseif ( bp_is_group_forum() && bp_group_is_visible() ) : ?>
-                                        <?php locate_template( array( 'groups/single/forum.php' ), true ) ?>
+                                                <?php if ( function_exists( 'bp_activity_install' ) ) : ?>
+                                                        <?php locate_template( array( 'groups/single/activity.php' ), true ) ?>
 
+                                                <?php elseif ( function_exists( 'bp_forums_setup' ) ) : ?>
+                                                        <?php locate_template( array( 'groups/single/forum.php' ), true ) ?>
+
+                                                <?php else : ?>
+                                                        <?php locate_template( array( 'groups/single/members.php' ), true ) ?>
+
+                                                <?php endif; ?>
+
+                                        <?php elseif ( function_exists( 'bp_forums_setup' ) && bp_is_group_forum() ) : ?>
+                                                <?php locate_template( array( 'groups/single/forum.php' ), true ) ?>
+
+                                        <?php elseif ( function_exists( 'bp_activity_install' ) && bp_is_group_activity() ) : ?>
+                                                <?php locate_template( array( 'groups/single/forum.php' ), true ) ?>
+
+                                        <?php elseif ( bp_is_group_members() ) : ?>
+                                                <?php locate_template( array( 'groups/single/members.php' ), true ) ?>
+
+                                        <?php elseif ( bp_is_group_invites() ) : ?>
+                                                <?php locate_template( array( 'groups/single/send-invites.php' ), true ) ?>
+
+                                        <?php endif; ?>
+
                                 <?php elseif ( bp_is_group_membership_request() ) : ?>
                                         <?php locate_template( array( 'groups/single/request-membership.php' ), true ) ?>
 
-                                <?php elseif ( bp_group_is_visible() ) : ?>
-                                        <?php locate_template( array( 'groups/single/activity.php' ), true ) ?>
-
                                 <?php else : ?>
                                         <?php /* The group is not visible, show the status message */ ?>