Changeset 3983

Timestamp:

02/01/2011 07:53:50 PM (14 years ago)

Author:

johnjamesjacoby

Message:

Use bp_current_item() in place of $bp->current_item global

Location:

trunk

Files:

• bp-core/bp-core-template.php (modified) (2 diffs)
• bp-forums/bp-forums-template.php (modified) (2 diffs)
• bp-groups/bp-groups-screens.php (modified) (2 diffs)

trunk/bp-core/bp-core-template.php

@@ -543 +543 @@
 function bp_current_action() {
     global $bp;
-    return apply_filters( 'bp_current_action', $bp->current_action );
+    $current_action = !empty( $bp->current_action ) ? $bp->current_action : false;
+    return apply_filters( 'bp_current_action', $current_action );
 }
 
 function bp_current_item() {
     global $bp;
-    return apply_filters( 'bp_current_item', $bp->current_item );
+    $current_item = !empty( $bp->current_item ) ? $bp->current_item : false;
+    return apply_filters( 'bp_current_item', $current_item );
 }
 
 function bp_action_variables() {
     global $bp;
-    return apply_filters( 'bp_action_variables', $bp->action_variables );
+    $action_variables = !empty( $bp->action_variables ) ? $bp->action_variables : false;
+    return apply_filters( 'bp_action_variables', $action_variables );
 }
 
@@ -738 +741 @@
 
 function bp_is_current_item( $item = '' ) {
-    global $bp;
-
-    if ( $item == $bp->current_item )
+    if ( !empty( $item ) && $item == bp_current_item() )
         return true;
 

trunk/bp-forums/bp-forums-template.php

@@ -550 +550 @@
             $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->groups->root_slug . '/' . $forum_template->topic->object_slug );
         else if ( !empty( $bp->is_single_item ) )
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_item );
+            $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . bp_current_item() );
         else
             $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_action );
@@ -1101 +1101 @@
 
         if ( $bp->is_single_item )
-            $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_item );
+            $permalink = trailingslashit( bp_get_root_domain() . '/' . $bp->current_component . '/' . bp_current_item() );
         else
             $permalink = trailingslashit( bp_get_root_domain() . $bp->current_component . '/' . $bp->current_action );

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

@@ -680 +680 @@
         // Ask for a login if the user is coming here via an email notification
         if ( !is_user_logged_in() )
-            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . bp_get_root_domain() . '/' . $bp->current_component . '/' . $bp->current_item . '/admin/membership-requests/' ) );
+            bp_core_redirect( site_url( 'wp-login.php?redirect_to=' . bp_get_root_domain() . '/' . $bp->current_component . '/' . bp_current_item() . '/admin/membership-requests/' ) );
 
         if ( !$bp->is_item_admin || 'public' == $bp->groups->current_group->status )
@@ -689 +689 @@
 
         $request_action = $bp->action_variables[1];
-        $membership_id = $bp->action_variables[2];
+        $membership_id  = $bp->action_variables[2];
 
         if ( isset($request_action) && isset($membership_id) ) {