Changeset 9373 for trunk/src/bp-activity/bp-activity-classes.php

Timestamp:

01/19/2015 08:11:55 PM (12 years ago)

Author:

johnjamesjacoby

Message:

Coding standards improvements to BP_Activity_Activity::save(). See #5138, #5891.

File:

• trunk/src/bp-activity/bp-activity-classes.php (modified) (2 diffs)

trunk/src/bp-activity/bp-activity-classes.php

@@ -193 +193 @@
          */
         public function save() {
-                global $wpdb, $bp;
+                global $wpdb;
+
+                $bp = buddypress();
 
                 $this->id                = apply_filters_ref_array( 'bp_activity_id_before_save',                array( $this->id,                &$this ) );
@@ -221 +223 @@
                 do_action_ref_array( 'bp_activity_before_save', array( &$this ) );
 
-                if ( !$this->component || !$this->type )
+                if ( empty( $this->component ) || empty( $this->type ) ) {
                         return false;
-
-                if ( !$this->primary_link )
+                }
+
+                if ( empty( $this->primary_link ) ) {
                         $this->primary_link = bp_loggedin_user_domain();
+                }
 
                 // If we have an existing ID, update the activity item, otherwise insert it.
-                if ( $this->id )
+                if ( ! empty( $this->id ) ) {
                         $q = $wpdb->prepare( "UPDATE {$bp->activity->table_name} SET user_id = %d, component = %s, type = %s, action = %s, content = %s, primary_link = %s, date_recorded = %s, item_id = %d, secondary_item_id = %d, hide_sitewide = %d, is_spam = %d WHERE id = %d", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->is_spam, $this->id );
-                else
+                } else {
                         $q = $wpdb->prepare( "INSERT INTO {$bp->activity->table_name} ( user_id, component, type, action, content, primary_link, date_recorded, item_id, secondary_item_id, hide_sitewide, is_spam ) VALUES ( %d, %s, %s, %s, %s, %s, %s, %d, %d, %d, %d )", $this->user_id, $this->component, $this->type, $this->action, $this->content, $this->primary_link, $this->date_recorded, $this->item_id, $this->secondary_item_id, $this->hide_sitewide, $this->is_spam );
-
-                if ( false === $wpdb->query( $q ) )
+                }
+
+                if ( false === $wpdb->query( $q ) ) {
                         return false;
+                }
 
                 // If this is a new activity item, set the $id property
-                if ( empty( $this->id ) )
+                if ( empty( $this->id ) ) {
                         $this->id = $wpdb->insert_id;
 
                 // If an existing activity item, prevent any changes to the content generating new @mention notifications.
-                else
+                } else {
                         add_filter( 'bp_activity_at_name_do_notifications', '__return_false' );
+                }
 
                 /**