Changeset 9658

Timestamp:

03/29/2015 04:27:24 AM (9 years ago)

Author:

johnjamesjacoby

Message:

XProfile: Add brackets to `class-bp-xprofile-field.php. Stylistic changes only.

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php (modified) (5 diffs)

trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php

@@ -54 +54 @@
         }
 
-        $bp  = buddypress();
-        $sql = $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_fields} WHERE id = %d", $id );
-
-        if ( $field = $wpdb->get_row( $sql ) ) {
+        $bp    = buddypress();
+        $field = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_fields} WHERE id = %d", $id ) );
+
+        if ( ! empty( $field ) ) {
             $this->id               = $field->id;
             $this->group_id          = $field->group_id;
@@ -95 +95 @@
         // Prevent deletion by url when can_delete is false.
         // Prevent deletion of option 1 since this invalidates fields with options.
-        if ( empty( $this->id ) || empty( $this->can_delete ) || ( $this->parent_id && $this->option_order == 1 ) )
+        if ( empty( $this->id ) || empty( $this->can_delete ) || ( $this->parent_id && $this->option_order == 1 ) ) {
             return false;
+        }
 
         $bp = buddypress();
 
-        if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_fields} WHERE id = %d OR parent_id = %d", $this->id, $this->id ) ) )
+        if ( !$wpdb->query( $wpdb->prepare( "DELETE FROM {$bp->profile->table_name_fields} WHERE id = %d OR parent_id = %d", $this->id, $this->id ) ) ) {
             return false;
+        }
 
         // delete the data in the DB for this field
-        if ( true === $delete_data )
+        if ( true === $delete_data ) {
             BP_XProfile_ProfileData::delete_for_field( $this->id );
+        }
 
         return true;
@@ -210 +213 @@
 
                         if ( is_array( $defaults ) ) {
-                            if ( isset( $defaults[$option_key] ) )
+                            if ( isset( $defaults[$option_key] ) ) {
                                 $is_default = 1;
+                            }
                         } else {
-                            if ( (int) $defaults == $option_key )
+                            if ( (int) $defaults == $option_key ) {
                                 $is_default = 1;
+                            }
                         }
 
@@ -336 +341 @@
         $bp = buddypress();
 
-        if ( empty( $bp->profile->table_name_fields ) || !isset( $field_name ) )
+        if ( empty( $bp->profile->table_name_fields ) || !isset( $field_name ) ) {
             return false;
+        }
 
         return $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE name = %s AND parent_id = 0", $field_name ) );
@@ -345 +351 @@
         global $wpdb;
 
-        if ( !is_numeric( $position ) || !is_numeric( $field_group_id ) )
+        if ( !is_numeric( $position ) || !is_numeric( $field_group_id ) ) {
             return false;
+        }
 
         $bp = buddypress();