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

Timestamp:

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

Author:

johnjamesjacoby

Message:

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

File:

• trunk/bp-groups/bp-groups-screens.php (modified) (8 diffs)

trunk/bp-groups/bp-groups-screens.php

@@ -454 +454 @@
     global $bp;
 
-    if ( !bp_is_current_component( 'groups' ) || !bp_is_current_action( 'admin' ) )
+    if ( !bp_is_groups_component() || !bp_is_current_action( 'admin' ) )
         return false;
 
@@ -466 +466 @@
     global $bp;
 
-    if ( bp_is_current_component( 'groups' ) && isset( $bp->action_variables[0] ) && 'edit-details' == $bp->action_variables[0] ) {
+    if ( bp_is_groups_component() && isset( $bp->action_variables[0] ) && 'edit-details' == $bp->action_variables[0] ) {
 
         if ( $bp->is_item_admin || $bp->is_item_mod  ) {
@@ -498 +498 @@
     global $bp;
 
-    if ( bp_is_current_component( 'groups' ) && isset( $bp->action_variables[0] ) && 'group-settings' == $bp->action_variables[0] ) {
+    if ( bp_is_groups_component() && isset( $bp->action_variables[0] ) && 'group-settings' == $bp->action_variables[0] ) {
 
         if ( !$bp->is_item_admin )
@@ -540 +540 @@
     global $bp;
 
-    if ( bp_is_current_component( 'groups' ) && isset( $bp->action_variables[0] ) && 'group-avatar' == $bp->action_variables[0] ) {
+    if ( bp_is_groups_component() && isset( $bp->action_variables[0] ) && 'group-avatar' == $bp->action_variables[0] ) {
 
         if ( !$bp->is_item_admin )
@@ -598 +598 @@
     global $bp;
 
-    if ( bp_is_current_component( 'groups' ) && isset( $bp->action_variables[0] ) && 'manage-members' == $bp->action_variables[0] ) {
+    if ( bp_is_groups_component() && isset( $bp->action_variables[0] ) && 'manage-members' == $bp->action_variables[0] ) {
 
         if ( !$bp->is_item_admin )
@@ -708 +708 @@
     global $bp;
 
-    if ( bp_is_current_component( 'groups' ) && isset( $bp->action_variables[0] ) && 'membership-requests' == $bp->action_variables[0] ) {
+    if ( bp_is_groups_component() && isset( $bp->action_variables[0] ) && 'membership-requests' == $bp->action_variables[0] ) {
 
         // Ask for a login if the user is coming here via an email notification
@@ -761 +761 @@
     global $bp;
 
-    if ( bp_is_current_component( 'groups' ) && isset( $bp->action_variables[0] ) && 'delete-group' == $bp->action_variables[0] ) {
+    if ( bp_is_groups_component() && isset( $bp->action_variables[0] ) && 'delete-group' == $bp->action_variables[0] ) {
 
         if ( !$bp->is_item_admin && !is_super_admin() )
@@ -781 +781 @@
                 do_action( 'groups_group_deleted', $bp->groups->current_group->id );
 
-                bp_core_redirect( $bp->loggedin_user->domain . $bp->groups->slug . '/' );
+                bp_core_redirect( $bp->loggedin_user->domain . bp_get_groups_slug() . '/' );
             }