Changeset 5758 for trunk/bp-core/bp-core-template.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-core/bp-core-template.php (modified) (11 diffs)

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

@@ -23 +23 @@
     // If we are looking at a member profile, then the we can use the current component as an
     // index. Otherwise we need to use the component's root_slug
-    $component_index = !empty( $bp->displayed_user ) ? $bp->current_component : bp_get_root_slug( $bp->current_component );
+    $component_index = !empty( $bp->displayed_user ) ? bp_current_component() : bp_get_root_slug( bp_current_component() );
 
     if ( !bp_is_single_item() ) {
@@ -32 +32 @@
         }
     } else {
-        if ( !isset( $bp->bp_options_nav[$bp->current_item] ) || count( $bp->bp_options_nav[$bp->current_item] ) < 1 ) {
+        if ( !isset( $bp->bp_options_nav[bp_current_item()] ) || count( $bp->bp_options_nav[bp_current_item()] ) < 1 ) {
             return false;
         } else {
-            $the_index = $bp->current_item;
+            $the_index = bp_current_item();
         }
     }
@@ -45 +45 @@
 
         // If the current action or an action variable matches the nav item id, then add a highlight CSS class.
-        if ( $subnav_item['slug'] == $bp->current_action ) {
+        if ( $subnav_item['slug'] == bp_current_action() ) {
             $selected = ' class="current selected"';
         } else {
@@ -661 +661 @@
         // Use current global component if none passed
         if ( empty( $component ) )
-            $component = $bp->current_component;
+            $component = bp_current_component();
 
         // Component is active
@@ -695 +695 @@
     // If no slug is passed, look at current_component
     if ( empty( $root_slug ) )
-        $root_slug = $bp->current_component;
+        $root_slug = bp_current_component();
 
     // No current component or root slug, so flee
@@ -763 +763 @@
 
     if ( !empty( $bp->current_component ) ) {
+
         // First, check to see whether $component_name and the current
         // component are a simple match
@@ -781 +782 @@
         // corresponding slug from $bp->active_components.
         } else if ( $key = array_search( $component, $bp->active_components ) ) {
-            if ( strstr( $bp->current_component, $key ) )
+            if ( strstr( $bp->current_component, $key ) ) {
                 $is_current_component = true;
+            }
 
         // If we haven't found a match yet, check against the root_slugs
@@ -790 +792 @@
                 // If the $component parameter does not match the current_component,
                 // then move along, these are not the droids you are looking for
-                if ( empty( $bp->{$id}->root_slug ) || $bp->{$id}->root_slug != $bp->current_component )
+                if ( empty( $bp->{$id}->root_slug ) || $bp->{$id}->root_slug != $bp->current_component ) {
                     continue;
+                }
 
                 if ( $id == $component ) {
@@ -808 +811 @@
 
         // Component name is in the page template name
-        if ( !empty( $page_template ) && strstr( strtolower( $page_template ), strtolower( $component ) ) )
+        if ( !empty( $page_template ) && strstr( strtolower( $page_template ), strtolower( $component ) ) ) {
             $is_current_component = true;
+        }
     }
 
@@ -833 +837 @@
  */
 function bp_is_current_action( $action = '' ) {
-    global $bp;
-
-    if ( $action == $bp->current_action )
+    if ( $action == bp_current_action() )
         return true;
 
@@ -1081 +1083 @@
 
 function bp_is_single_activity() {
-    global $bp;
-
-    if ( bp_is_activity_component() && is_numeric( $bp->current_action ) )
+    if ( bp_is_activity_component() && is_numeric( bp_current_action() ) )
         return true;