Ticket #3465: 3465.001.diff

bp-core/bp-core-template.php

@@ -494 +494 @@
  */
 function bp_action_variable( $position = 0 ) {
         $action_variables = bp_action_variables();
-        
+
         $action_variable = isset( $action_variables[$position] ) ? $action_variables[$position] : false;
-        
+
         return apply_filters( 'bp_action_variable', $action_variable, $position );
 }
 
@@ -668 +668 @@
                 // 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
                 // corresponding slug from $bp->active_components.
@@ -676 +676 @@
                         if ( strstr( $bp->current_component, $key ) )
                                 $is_current_component = true;
 
-                // If we haven't found a match yet, check against the root_slugs 
+                // 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 ) {
@@ -751 +751 @@
  * @param int $position The array key you're testing against. If you don't provide a $position,
  *   the function will return true if the $action_variable is found *anywhere* in the action
  *   variables array.
- * @return bool 
+ * @return bool
  */
 function bp_is_action_variable( $action_variable = '', $position = false ) {
         $is_action_variable = false;
-        
+
         if ( false !== $position ) {
-                // When a $position is specified, check that slot in the action_variables array         
+                // When a $position is specified, check that slot in the action_variables array
                 if ( $action_variable ) {
                         $is_action_variable = $action_variable == bp_action_variable( $position );
                 } else {
@@ -769 +769 @@
                 // When no $position is specified, check the entire array
                 $is_action_variable = in_array( $action_variable, (array)bp_action_variables() );
         }
-        
+
         return apply_filters( 'bp_is_action_variable', $is_action_variable, $action_variable, $position );
 }
 
@@ -828 +828 @@
  */
 function bp_is_root_component( $component_name ) {
         global $bp;
-        
+
         if ( !isset( $bp->active_components ) )
                 return false;
 
@@ -1029 +1029 @@
 
         if ( bp_is_current_component( 'xprofile' ) && bp_is_current_action( 'edit' ) )
                 return true;
-                
+
         return false;
 }
 
@@ -1289 +1289 @@
 /** Registration **************************************************************/
 
 function bp_is_activation_page() {
-        if ( bp_is_current_component( 'activation' ) )
+        if ( bp_is_current_component( 'activate' ) )
                 return true;
 
         return false;