Changeset 5441 for trunk/src/includes/extend/buddypress/activity.php

Timestamp:

07/10/2014 03:54:41 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Bracketize extensions, and missed a spot in the admin.

File:

• trunk/src/includes/extend/buddypress/activity.php (modified) (12 diffs)

trunk/src/includes/extend/buddypress/activity.php

@@ -271 +271 @@
 
                 // Bail if no activity ID is in post meta
-                if ( empty( $activity_id ) )
+                if ( empty( $activity_id ) ) {
                         return null;
+                }
 
                 // Get the activity stream item, bail if it doesn't exist
                 $existing = bp_activity_get_specific( array( 'activity_ids' => $activity_id, 'show_hidden' => true, 'spam' => 'all', ) );
-                if ( empty( $existing['total'] ) || ( 1 !== (int) $existing['total'] ) )
+                if ( empty( $existing['total'] ) || ( 1 !== (int) $existing['total'] ) ) {
                         return null;
+                }
 
                 // Return the activity ID since we've verified the connection
@@ -296 +298 @@
 
                 // Already forced off, so comply
-                if ( false === $can_comment )
+                if ( false === $can_comment ) {
                         return $can_comment;
+                }
 
                 // Check if blog & forum activity stream commenting is off
@@ -383 +386 @@
 
                 // Bail early if topic is by anonymous user
-                if ( !empty( $anonymous_data ) )
-                        return;
+                if ( !empty( $anonymous_data ) ) {
+                        return;
+                }
 
                 // Bail if site is private
-                if ( !bbp_is_site_public() )
-                        return;
+                if ( !bbp_is_site_public() ) {
+                        return;
+                }
 
                 // Validate activity data
@@ -396 +401 @@
 
                 // Bail if user is not active
-                if ( bbp_is_user_inactive( $user_id ) )
-                        return;
+                if ( bbp_is_user_inactive( $user_id ) ) {
+                        return;
+                }
 
                 // Bail if topic is not published
-                if ( !bbp_is_topic_published( $topic_id ) )
-                        return;
+                if ( !bbp_is_topic_published( $topic_id ) ) {
+                        return;
+                }
 
                 // User link for topic author
@@ -451 +458 @@
 
                 // Get activity ID, bail if it doesn't exist
-                if ( $activity_id = $this->get_activity_id( $topic_id ) )
+                $activity_id = $this->get_activity_id( $topic_id );
+                if ( !empty( $activity_id ) ) {
                         return bp_activity_delete( array( 'id' => $activity_id ) );
+                }
 
                 return false;
@@ -460 +469 @@
          * Update the activity stream entry when a topic status changes
          *
-         * @param int $post_id
+         * @param int $topic_id
          * @param obj $post
          * @uses get_post_type()
@@ -475 +484 @@
 
                 // Bail early if not a topic
-                if ( get_post_type( $post ) !== bbp_get_topic_post_type() )
-                        return;
+                if ( get_post_type( $post ) !== bbp_get_topic_post_type() ) {
+                        return;
+                }
 
                 $topic_id = bbp_get_topic_id( $topic_id );
 
                 // Bail early if topic is by anonymous user
-                if ( bbp_is_topic_anonymous( $topic_id ) )
-                        return;
+                if ( bbp_is_topic_anonymous( $topic_id ) ) {
+                        return;
+                }
 
                 // Action based on new status
@@ -524 +535 @@
 
                 // Do not log activity of anonymous users
-                if ( !empty( $anonymous_data ) )
-                        return;
+                if ( !empty( $anonymous_data ) ) {
+                        return;
+                }
 
                 // Bail if site is private
-                if ( !bbp_is_site_public() )
-                        return;
+                if ( !bbp_is_site_public() ) {
+                        return;
+                }
 
                 // Validate activity data
@@ -538 +551 @@
 
                 // Bail if user is not active
-                if ( bbp_is_user_inactive( $user_id ) )
-                        return;
+                if ( bbp_is_user_inactive( $user_id ) ) {
+                        return;
+                }
 
                 // Bail if reply is not published
-                if ( !bbp_is_reply_published( $reply_id ) )
-                        return;
+                if ( !bbp_is_reply_published( $reply_id ) ) {
+                        return;
+                }
 
                 // Setup links for activity stream
@@ -597 +612 @@
 
                 // Get activity ID, bail if it doesn't exist
-                if ( $activity_id = $this->get_activity_id( $reply_id ) )
+                $activity_id = $this->get_activity_id( $reply_id );
+                if ( !empty( $activity_id ) ) {
                         return bp_activity_delete( array( 'id' => $activity_id ) );
+                }
 
                 return false;
@@ -606 +623 @@
          * Update the activity stream entry when a reply status changes
          *
-         * @param int $post_id
+         * @param int $reply_id
          * @param obj $post
          * @uses get_post_type()
@@ -622 +639 @@
 
                 // Bail early if not a reply
-                if ( get_post_type( $post ) !== bbp_get_reply_post_type() )
-                        return;
+                if ( get_post_type( $post ) !== bbp_get_reply_post_type() ) {
+                        return;
+                }
 
                 $reply_id = bbp_get_reply_id( $reply_id );
 
                 // Bail early if reply is by anonymous user
-                if ( bbp_is_reply_anonymous( $reply_id ) )
-                        return;
+                if ( bbp_is_reply_anonymous( $reply_id ) ) {
+                        return;
+                }
 
                 // Action based on new status