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

Timestamp:

07/28/2011 01:42:30 AM (15 years ago)

Author:

boonebgorges

Message:

Ensures that bp_is_current_component() checks against slugs as well as rot_slugs. Sets members default component to activity slug rather than to 'activity'. Fixes #3398, props r-a-y

File:

• trunk/bp-core/bp-core-template.php (modified) (3 diffs)

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

@@ -656 +656 @@
 
     if ( !empty( $bp->current_component ) ) {
-
         // First, check to see whether $component_name and the current
         // component are a simple match
@@ -667 +666 @@
             $is_current_component = true;
 
+        // Because slugs can differ from root_slugs, we should check them too
+        } elseif ( isset( $bp->{$component}->slug ) && $bp->{$component}->slug == $bp->current_component ) {
+            $is_current_component = true;
+            
         // Next, check to see whether $component is a canonical,
         // non-translatable component name. If so, we can return its
@@ -674 +677 @@
                 $is_current_component = true;
 
-        // If we haven't found a match yet, check against the root_slugs
-        // created by $bp->pages
+        // If we haven't found a match yet, check against the root_slugs 
+        // created by $bp->pages, as well as the regular slugs
         } else {
             foreach ( $bp->active_components as $key => $id ) {