Changeset 6097

Timestamp:

06/14/2012 06:33:23 PM (12 years ago)

Author:

boonebgorges

Message:

Improvements to the way the hide_sitewide default is determined in groups_record_activity()

groups_record_activity() should attempt to use the item_id passed to the
function when determining the default value of 'hide_sitewide', instead of the
current group id (which will not always be populated, eg in the groups
directory).

Fixes #4134

Props chriskeeble

File:

• trunk/bp-groups/bp-groups-activity.php (modified) (1 diff)

trunk/bp-groups/bp-groups-activity.php

@@ -35 +35 @@
         return false;
 
-    // If the group is not public, hide the activity sitewide.
-    if ( isset( $bp->groups->current_group->status ) && 'public' == $bp->groups->current_group->status )
-        $hide_sitewide = false;
-    else
-        $hide_sitewide = true;
+    // Set the default for hide_sitewide by checking the status of the group
+    $hide_sitewide = false;
+    if ( !empty( $args['item_id'] ) ) {
+        if ( bp_get_current_group_id() == $args['item_id'] ) {
+            $group = groups_get_current_group();
+        } else {
+            $group = groups_get_group( array( 'group_id' => $args['item_id'] ) );
+        }
+
+        if ( isset( $group->status ) && 'public' != $group->status ) {
+            $hide_sitewide = true;
+        }
+    }
 
     $defaults = array (