Changeset 6981

Timestamp:

05/01/2013 01:48:00 PM (13 years ago)

Author:

boonebgorges

Message:

Coding standards in bp_activity_action_permalink_router()

File:

• trunk/bp-activity/bp-activity-actions.php (modified) (5 diffs)

trunk/bp-activity/bp-activity-actions.php

@@ -46 +46 @@
  */
 function bp_activity_action_permalink_router() {
-        global $bp;
 
         // Not viewing activity
-        if ( !bp_is_activity_component() || !bp_is_current_action( 'p' ) )
+        if ( ! bp_is_activity_component() || ! bp_is_current_action( 'p' ) )
                 return false;
 
         // No activity to display
-        if ( !bp_action_variable( 0 ) || !is_numeric( bp_action_variable( 0 ) ) )
+        if ( ! bp_action_variable( 0 ) || ! is_numeric( bp_action_variable( 0 ) ) )
                 return false;
 
@@ -63 +62 @@
                 bp_do_404();
                 return;
-
         } else {
                 $activity = $activity['activities'][0];
@@ -72 +70 @@
 
         // Redirect based on the type of activity
-        if ( bp_is_active( 'groups' ) && $activity->component == $bp->groups->id ) {
+        if ( bp_is_active( 'groups' ) && $activity->component == buddypress()->groups->id ) {
 
                 // Activity is a user update
-                if ( !empty( $activity->user_id ) ) {
+                if ( ! empty( $activity->user_id ) ) {
                         $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . bp_get_activity_slug() . '/' . $activity->id . '/';
 
@@ -93 +91 @@
 
         // If set, add the original query string back onto the redirect URL
-        if ( !empty( $_SERVER['QUERY_STRING'] ) ) {
+        if ( ! empty( $_SERVER['QUERY_STRING'] ) ) {
                 $query_frags = array();
                 wp_parse_str( $_SERVER['QUERY_STRING'], $query_frags );
@@ -100 +98 @@
 
         // Allow redirect to be filtered
-        if ( !$redirect = apply_filters_ref_array( 'bp_activity_permalink_redirect_url', array( $redirect, &$activity ) ) )
+        if ( ! $redirect = apply_filters_ref_array( 'bp_activity_permalink_redirect_url', array( $redirect, &$activity ) ) ) {
                 bp_core_redirect( bp_get_root_domain() );
+        }
 
         // Redirect to the actual activity permalink page