Changeset 9315 for trunk/src/bp-xprofile/bp-xprofile-classes.php

Timestamp:

01/08/2015 09:43:47 PM (11 years ago)

Author:

johnjamesjacoby

Message:

s/else if/elseif/

"The keyword elseif should be used instead of else if so that all control keywords look like single words."

Props wonderboymusic, hnla. See #6097.

File:

• trunk/src/bp-xprofile/bp-xprofile-classes.php (modified) (9 diffs)

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

@@ -192 +192 @@
         if ( ! empty( $profile_group_id ) ) {
             $where_sql = $wpdb->prepare( 'WHERE g.id = %d', $profile_group_id );
-        } else if ( $exclude_groups ) {
+        } elseif ( $exclude_groups ) {
             $exclude_groups = join( ',', wp_parse_id_list( $exclude_groups ) );
             $where_sql = "WHERE g.id NOT IN ({$exclude_groups})";
@@ -493 +493 @@
                 if ( 'default_visibility' == $level->meta_key ) {
                     $default_visibility_levels[ $level->object_id ]['default'] = $level->meta_value;
-                } else if ( 'allow_custom_visibility' == $level->meta_key ) {
+                } elseif ( 'allow_custom_visibility' == $level->meta_key ) {
                     $default_visibility_levels[ $level->object_id ]['allow_custom'] = $level->meta_value;
                 }
@@ -1325 +1325 @@
                 $result   = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_data} SET value = %s, last_updated = %s WHERE user_id = %d AND field_id = %d", $this->value, $this->last_updated, $this->user_id, $this->field_id ) );
 
-            } else if ( $this->exists() && empty( $this->value ) ) {
+            } elseif ( $this->exists() && empty( $this->value ) ) {
                 // Data removed, delete the entry.
                 $result   = $this->delete();
@@ -1641 +1641 @@
                     if ( $values[$i]->name == $fields[$j] ) {
                         $new_values[$fields[$j]] = $values[$i]->value;
-                    } else if ( !array_key_exists( $fields[$j], $new_values ) ) {
+                    } elseif ( !array_key_exists( $fields[$j], $new_values ) ) {
                         $new_values[$fields[$j]] = NULL;
                     }
@@ -3735 +3735 @@
                 $relation = $query;
 
-            } else if ( ! is_array( $query ) ) {
+            } elseif ( ! is_array( $query ) ) {
                 continue;
 
             // First-order clause.
-            } else if ( $this->is_first_order_clause( $query ) ) {
+            } elseif ( $this->is_first_order_clause( $query ) ) {
                 if ( isset( $query['value'] ) && array() === $query['value'] ) {
                     unset( $query['value'] );
@@ -3769 +3769 @@
          * simplifies the logic around combining key-only queries.
          */
-        } else if ( 1 === count( $clean_queries ) ) {
+        } elseif ( 1 === count( $clean_queries ) ) {
             $clean_queries['relation'] = 'OR';
 
@@ -3886 +3886 @@
             if ( 'relation' === $key ) {
                 $relation = $query['relation'];
-            } else if ( is_array( $clause ) ) {
+            } elseif ( is_array( $clause ) ) {
 
                 // This is a first-order clause.
@@ -3895 +3895 @@
                     if ( ! $where_count ) {
                         $sql_chunks['where'][] = '';
-                    } else if ( 1 === $where_count ) {
+                    } elseif ( 1 === $where_count ) {
                         $sql_chunks['where'][] = $clause_sql['where'][0];
                     } else {
@@ -4150 +4150 @@
 
             // Clauses joined by AND with "negative" operators share a join only if they also share a key.
-            } else if ( isset( $sibling['field_id'] ) && isset( $clause['field_id'] ) && $sibling['field_id'] === $clause['field_id'] ) {
+            } elseif ( isset( $sibling['field_id'] ) && isset( $clause['field_id'] ) && $sibling['field_id'] === $clause['field_id'] ) {
                 $compatible_compares = array( '!=', 'NOT IN', 'NOT LIKE' );
             }