Changeset 31087

Timestamp:

01/08/2015 06:25:40 AM (10 years ago)

Author:

wonderboymusic

Message:

In wp-includes/taxonomy.php:

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

See #30799.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (16 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -766 +766 @@
 
             // First-order clause.
-            } else if ( self::is_first_order_clause( $query ) ) {
+            } elseif ( self::is_first_order_clause( $query ) ) {
 
                 $cleaned_clause = array_merge( $defaults, $query );
@@ -796 +796 @@
 
             // Otherwise, it's a nested query, so we recurse.
-            } else if ( is_array( $query ) ) {
+            } elseif ( is_array( $query ) ) {
                 $cleaned_subquery = $this->sanitize_query( $query );
 
@@ -940 +940 @@
             if ( 'relation' === $key ) {
                 $relation = $query['relation'];
-            } else if ( is_array( $clause ) ) {
+            } elseif ( is_array( $clause ) ) {
 
                 // This is a first-order clause.
@@ -949 +949 @@
                     if ( ! $where_count ) {
                         $sql_chunks['where'][] = '';
-                    } else if ( 1 === $where_count ) {
+                    } elseif ( 1 === $where_count ) {
                         $sql_chunks['where'][] = $clause_sql['where'][0];
                     } else {
@@ -1394 +1394 @@
         if ( empty($value) )
             return false;
-    } else if ( 'name' == $field ) {
+    } elseif ( 'name' == $field ) {
         // Assume already escaped
         $value = wp_unslash($value);
         $field = 't.name';
-    } else if ( 'term_taxonomy_id' == $field ) {
+    } elseif ( 'term_taxonomy_id' == $field ) {
         $value = (int) $value;
         $field = 'tt.term_taxonomy_id';
@@ -1700 +1700 @@
     if ( 'count' == $_orderby ) {
         $orderby = 'tt.count';
-    } else if ( 'name' == $_orderby ) {
+    } elseif ( 'name' == $_orderby ) {
         $orderby = 't.name';
-    } else if ( 'slug' == $_orderby ) {
+    } elseif ( 'slug' == $_orderby ) {
         $orderby = 't.slug';
-    } else if ( 'include' == $_orderby && ! empty( $args['include'] ) ) {
+    } elseif ( 'include' == $_orderby && ! empty( $args['include'] ) ) {
         $include = implode( ',', array_map( 'absint', $args['include'] ) );
         $orderby = "FIELD( t.term_id, $include )";
-    } else if ( 'term_group' == $_orderby ) {
+    } elseif ( 'term_group' == $_orderby ) {
         $orderby = 't.term_group';
-    } else if ( 'none' == $_orderby ) {
+    } elseif ( 'none' == $_orderby ) {
         $orderby = '';
     } elseif ( empty($_orderby) || 'id' == $_orderby ) {
@@ -2207 +2207 @@
         else
             $value = esc_attr($value);
-    } else if ( 'db' == $context ) {
+    } elseif ( 'db' == $context ) {
 
         /**
@@ -2246 +2246 @@
         }
 
-    } else if ( 'rss' == $context ) {
+    } elseif ( 'rss' == $context ) {
 
         /**
@@ -2303 +2303 @@
     }
 
-    if ( 'attribute' == $context )
+    if ( 'attribute' == $context ) {
         $value = esc_attr($value);
-    else if ( 'js' == $context )
+    } elseif ( 'js' == $context ) {
         $value = esc_js($value);
-
+    }
     return $value;
 }
@@ -2623 +2623 @@
     $fields = $args['fields'];
 
-    if ( 'count' == $orderby )
+    if ( 'count' == $orderby ) {
         $orderby = 'tt.count';
-    else if ( 'name' == $orderby )
+    } elseif ( 'name' == $orderby ) {
         $orderby = 't.name';
-    else if ( 'slug' == $orderby )
+    } elseif ( 'slug' == $orderby ) {
         $orderby = 't.slug';
-    else if ( 'term_group' == $orderby )
+    } elseif ( 'term_group' == $orderby ) {
         $orderby = 't.term_group';
-    else if ( 'term_order' == $orderby )
+    } elseif ( 'term_order' == $orderby ) {
         $orderby = 'tr.term_order';
-    else if ( 'none' == $orderby ) {
+    } elseif ( 'none' == $orderby ) {
         $orderby = '';
         $order = '';
@@ -2655 +2655 @@
 
     $select_this = '';
-    if ( 'all' == $fields )
+    if ( 'all' == $fields ) {
         $select_this = 't.*, tt.*';
-    else if ( 'ids' == $fields )
+    } elseif ( 'ids' == $fields ) {
         $select_this = 't.term_id';
-    else if ( 'names' == $fields )
+    } elseif ( 'names' == $fields ) {
         $select_this = 't.name';
-    else if ( 'slugs' == $fields )
+    } elseif ( 'slugs' == $fields ) {
         $select_this = 't.slug';
-    else if ( 'all_with_object_id' == $fields )
+    } elseif ( 'all_with_object_id' == $fields ) {
         $select_this = 't.*, tt.*, tr.object_id';
-
+    }
     $query = "SELECT $select_this FROM $wpdb->terms AS t INNER JOIN $wpdb->term_taxonomy AS tt ON tt.term_id = t.term_id INNER JOIN $wpdb->term_relationships AS tr ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tt.taxonomy IN ($taxonomies) AND tr.object_id IN ($object_ids) $orderby $order";
 
@@ -2677 +2677 @@
         update_term_cache( $terms );
         $objects = true;
-    } else if ( 'ids' == $fields || 'names' == $fields || 'slugs' == $fields ) {
+    } elseif ( 'ids' == $fields || 'names' == $fields || 'slugs' == $fields ) {
         $_terms = $wpdb->get_col( $query );
         $_field = ( 'ids' == $fields ) ? 'term_id' : 'name';
@@ -2684 +2684 @@
         }
         $terms = array_merge( $terms, $_terms );
-    } else if ( 'tt_ids' == $fields ) {
+    } elseif ( 'tt_ids' == $fields ) {
         $terms = $wpdb->get_col("SELECT tr.term_taxonomy_id FROM $wpdb->term_relationships AS tr INNER JOIN $wpdb->term_taxonomy AS tt ON tr.term_taxonomy_id = tt.term_taxonomy_id WHERE tr.object_id IN ($object_ids) AND tt.taxonomy IN ($taxonomies) $orderby $order");
         foreach ( $terms as $key => $tt_id ) {
@@ -2823 +2823 @@
             // The alias we want is already in a group, so let's use that one.
             $term_group = $alias->term_group;
-        } else if ( ! empty( $alias->term_id ) ) {
+        } elseif ( ! empty( $alias->term_id ) ) {
             /*
              * The alias is not in a group, so we create a new one
@@ -3335 +3335 @@
             // The alias we want is already in a group, so let's use that one.
             $term_group = $alias->term_group;
-        } else if ( ! empty( $alias->term_id ) ) {
+        } elseif ( ! empty( $alias->term_id ) ) {
             /*
              * The alias is not in a group, so we create a new one
@@ -4330 +4330 @@
         if ( is_taxonomy_hierarchical( $object_type ) ) {
             $resource_type = 'taxonomy';
-        } else if ( post_type_exists( $object_type ) ) {
+        } elseif ( post_type_exists( $object_type ) ) {
             $resource_type = 'post_type';
         }