Changeset 4648 for trunk/bp-groups/bp-groups-actions.php

Timestamp:

07/12/2011 02:39:11 AM (15 years ago)

Author:

johnjamesjacoby

Message:

Audit the usage of $bp->groups->slug. See #3325.

File:

• trunk/bp-groups/bp-groups-actions.php (modified) (6 diffs)

trunk/bp-groups/bp-groups-actions.php

@@ -14 +14 @@
 
     // If we're not at domain.org/groups/create/ then return false
-    if ( !bp_is_current_component( 'groups' ) || !bp_is_current_action( 'create' ) )
+    if ( !bp_is_groups_component() || !bp_is_current_action( 'create' ) )
         return false;
 
@@ -199 +199 @@
     global $bp;
 
-    if ( !bp_is_single_item() || !bp_is_current_component( 'groups' ) || !bp_is_current_action( 'join' ) )
+    if ( !bp_is_single_item() || !bp_is_groups_component() || !bp_is_current_action( 'join' ) )
         return false;
 
@@ -234 +234 @@
     global $bp;
 
-    if ( !bp_is_single_item() || !bp_is_current_component( 'groups' ) || !bp_is_current_action( 'leave-group' ) )
+    if ( !bp_is_single_item() || !bp_is_groups_component() || !bp_is_current_action( 'leave-group' ) )
         return false;
 
@@ -259 +259 @@
     global $bp;
 
-    if ( !bp_is_current_component( 'groups' ) || !bp_is_current_action( 'create' ) )
+    if ( !bp_is_groups_component() || !bp_is_current_action( 'create' ) )
         return false;
 
@@ -283 +283 @@
     global $bp, $wpdb;
 
-    if ( bp_is_current_component( $bp->groups->slug ) && isset( $_GET['random-group'] ) ) {
+    if ( bp_is_groups_component() && isset( $_GET['random-group'] ) ) {
         $group = groups_get_groups( array( 'type' => 'random', 'per_page' => 1 ) );
 
-        bp_core_redirect( bp_get_root_domain() . '/' . $bp->groups->slug . '/' . $group['groups'][0]->slug . '/' );
+        bp_core_redirect( bp_get_root_domain() . '/' . bp_get_groups_root_slug() . '/' . $group['groups'][0]->slug . '/' );
     }
 }
@@ -294 +294 @@
     global $bp, $wp_query;
 
-    if ( !bp_is_active( 'activity' ) || !bp_is_current_component( 'groups' ) || !isset( $bp->groups->current_group ) || !bp_is_current_action( 'feed' ) )
+    if ( !bp_is_active( 'activity' ) || !bp_is_groups_component() || !isset( $bp->groups->current_group ) || !bp_is_current_action( 'feed' ) )
         return false;