Changeset 31090 for trunk/src/wp-includes/meta.php

Timestamp:

01/08/2015 07:04:40 AM (11 years ago)

Author:

wonderboymusic

Message:

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

This was a mess, is now standardized across the codebase, except for a few 3rd-party libs.

See #30799.

File:

• trunk/src/wp-includes/meta.php (modified) (6 diffs)

trunk/src/wp-includes/meta.php

@@ -996 +996 @@
                 $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'] );
@@ -1030 +1030 @@
          * simplifies the logic around combining key-only queries.
          */
-        } else if ( 1 === count( $clean_queries ) ) {
+        } elseif ( 1 === count( $clean_queries ) ) {
             $clean_queries['relation'] = 'OR';
 
@@ -1094 +1094 @@
                 $existing_meta_query,
             );
-        } else if ( ! empty( $primary_meta_query ) ) {
+        } elseif ( ! empty( $primary_meta_query ) ) {
             $meta_query = array(
                 $primary_meta_query,
             );
-        } else if ( ! empty( $existing_meta_query ) ) {
+        } elseif ( ! empty( $existing_meta_query ) ) {
             $meta_query = $existing_meta_query;
         }
@@ -1255 +1255 @@
             if ( 'relation' === $key ) {
                 $relation = $query['relation'];
-            } else if ( is_array( $clause ) ) {
+            } elseif ( is_array( $clause ) ) {
 
                 // This is a first-order clause.
@@ -1264 +1264 @@
                     if ( ! $where_count ) {
                         $sql_chunks['where'][] = '';
-                    } else if ( 1 === $where_count ) {
+                    } elseif ( 1 === $where_count ) {
                         $sql_chunks['where'][] = $clause_sql['where'][0];
                     } else {
@@ -1493 +1493 @@
 
             // Clauses joined by AND with "negative" operators share a join only if they also share a key.
-            } else if ( isset( $sibling['key'] ) && isset( $clause['key'] ) && $sibling['key'] === $clause['key'] ) {
+            } elseif ( isset( $sibling['key'] ) && isset( $clause['key'] ) && $sibling['key'] === $clause['key'] ) {
                 $compatible_compares = array( '!=', 'NOT IN', 'NOT LIKE' );
             }