Changeset 3983 for trunk/bp-core/bp-core-template.php

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

File:

• trunk/bp-core/bp-core-template.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;