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

Timestamp:

01/08/2015 07:04:40 AM (10 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/query.php (modified) (5 diffs)

trunk/src/wp-includes/query.php

@@ -1655 +1655 @@
                 if ( strlen($qv['m']) > 9 ) {
                     $this->is_time = true;
-                } else if ( strlen($qv['m']) > 7 ) {
+                } elseif ( strlen( $qv['m'] ) > 7 ) {
                     $this->is_day = true;
-                } else if ( strlen($qv['m']) > 5 ) {
+                } elseif ( strlen( $qv['m'] ) > 5 ) {
                     $this->is_month = true;
                 } else {
@@ -1957 +1957 @@
                     $q['tag_slug__in'][] = $tag;
                 }
-            } else if ( preg_match('/[+\r\n\t ]+/', $q['tag']) || !empty($q['cat']) ) {
+            } elseif ( preg_match('/[+\r\n\t ]+/', $q['tag'] ) || ! empty( $q['cat'] ) ) {
                 $tags = preg_split('/[+\r\n\t ]+/', $q['tag']);
                 foreach ( (array) $tags as $tag ) {
@@ -2468 +2468 @@
         if ( $q['posts_per_page'] < -1 )
             $q['posts_per_page'] = abs($q['posts_per_page']);
-        else if ( $q['posts_per_page'] == 0 )
+        elseif ( $q['posts_per_page'] == 0 )
             $q['posts_per_page'] = 1;
 
@@ -4351 +4351 @@
         } elseif ( in_array( $page_obj->post_title, $page ) ) {
             return true;
-        } else if ( in_array( $page_obj->post_name, $page ) ) {
+        } elseif ( in_array( $page_obj->post_name, $page ) ) {
             return true;
         } else {
@@ -4569 +4569 @@
         if ( $post->ID === get_queried_object_id() && ( $this->is_page() || $this->is_single() ) ) {
             $more = 1;
-        } else if ( $this->is_feed() ) {
+        } elseif ( $this->is_feed() ) {
             $more = 1;
         } else {