Changeset 5758 for trunk/bp-groups/bp-groups-loader.php

Timestamp:

02/13/2012 05:46:52 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Clean up $bp->current_component, $bp->current_action, and $bp->current_item usage. Fixes #3738.

File:

• trunk/bp-groups/bp-groups-loader.php (modified) (2 diffs)

trunk/bp-groups/bp-groups-loader.php

@@ -159 +159 @@
 
         // If the user was attempting to access a group, but no group by that name was found, 404
-        if ( bp_is_groups_component() && empty( $this->current_group ) && !empty( $bp->current_action ) && !in_array( $bp->current_action, $this->forbidden_names ) ) {
+        if ( bp_is_groups_component() && empty( $this->current_group ) && bp_current_action() && !in_array( bp_current_action(), $this->forbidden_names ) ) {
             bp_do_404();
             return;
@@ -169 +169 @@
             // Prepare for a redirect to the canonical URL
             $bp->redirect_stack['base_url']  = bp_get_group_permalink( $this->current_group );
-            $bp->redirect_stack['action']    = $bp->current_action;
+            $bp->redirect_stack['action']    = bp_current_action();
         }