Ticket #3398: 3398.01.patch

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 );
 }
 
@@ -748 +748 @@
  * @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 {
@@ -766 +766 @@
                 // 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 );
 }
 
@@ -825 +825 @@
  */
 function bp_is_root_component( $component_name ) {
         global $bp;
-        
+
         if ( !isset( $bp->active_components ) )
                 return false;
 
@@ -912 +912 @@
 }
 
 function bp_is_activity_component() {
-        if ( bp_is_current_component( 'activity' ) )
+        if ( bp_is_current_component( 'activity' ) || bp_is_current_component( bp_get_activity_slug() ) )
                 return true;
 
         return false;
@@ -966 +966 @@
 function bp_is_single_activity() {
         global $bp;
 
-        if ( bp_is_current_component( 'activity' ) && is_numeric( $bp->current_action ) )
+        if ( bp_is_activity_component() && is_numeric( $bp->current_action ) )
                 return true;
 
         return false;
@@ -997 +997 @@
 function bp_is_user_activity() {
         global $bp;
 
-        if ( bp_is_current_component( 'activity' ) )
+        if ( bp_is_activity_component() )
                 return true;
 
         return false;
@@ -1026 +1026 @@
 
         if ( bp_is_current_component( 'xprofile' ) && bp_is_current_action( 'edit' ) )
                 return true;
-                
+
         return false;
 }
 

bp-members/bp-members-loader.php

@@ -109 +109 @@
                 /** Default Profile Component *****************************************/
                 if ( !defined( 'BP_DEFAULT_COMPONENT' ) ) {
                         if ( bp_is_active( 'activity' ) && isset( $bp->pages->activity ) )
-                                $bp->default_component = $bp->activity->id;
+                                $bp->default_component = bp_get_activity_slug();
                         else
                                 $bp->default_component = ( 'xprofile' == $bp->profile->id ) ? 'profile' : $bp->profile->id;