Changeset 9315 for trunk/src/bp-core/bp-core-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-core/bp-core-classes.php (modified) (6 diffs)

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

@@ -279 +279 @@
                     $sql['orderby'] = "ORDER BY u.user_id";
                     $sql['order'] = "DESC";
-                } else if ( 'random' == $type ) {
+                } elseif ( 'random' == $type ) {
                     $sql['orderby'] = "ORDER BY rand()";
                 } else {
@@ -2036 +2036 @@
             // No button if viewing your own profile (and not in
             // a members loop)
-            } else if ( bp_is_my_profile() ) {
+            } elseif ( bp_is_my_profile() ) {
                 return false;
             }
@@ -2834 +2834 @@
                         if ( 'relation' === $key ) {
                                 $relation = $query['relation'];
-                        } else if ( is_array( $clause ) ) {
+                        } elseif ( is_array( $clause ) ) {
                                 // This is a first-order clause
                                 if ( $this->is_first_order_clause( $clause ) ) {
@@ -2842 +2842 @@
                                         if ( ! $where_count ) {
                                                 $sql_chunks['where'][] = '';
-                                        } else if ( 1 === $where_count ) {
+                                        } elseif ( 1 === $where_count ) {
                                                 $sql_chunks['where'][] = $clause_sql['where'][0];
                                         } else {
@@ -2905 +2905 @@
                 $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'] );
@@ -2939 +2939 @@
          * simplifies the logic around combining key-only queries.
          */
-        } else if ( 1 === count( $clean_queries ) ) {
+        } elseif ( 1 === count( $clean_queries ) ) {
             $clean_queries['relation'] = 'OR';