Changeset 31090 for trunk/src/wp-includes/class-wp.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/class-wp.php (modified) (2 diffs)

trunk/src/wp-includes/class-wp.php

@@ -136 +136 @@
         $post_type_query_vars = array();
 
-        if ( is_array($extra_query_vars) )
+        if ( is_array( $extra_query_vars ) ) {
             $this->extra_query_vars = & $extra_query_vars;
-        else if (! empty($extra_query_vars))
-            parse_str($extra_query_vars, $this->extra_query_vars);
-
+        } elseif ( ! empty( $extra_query_vars ) ) {
+            parse_str( $extra_query_vars, $this->extra_query_vars );
+        }
         // Process PATH_INFO, REQUEST_URI, and 404 for permalinks.
 
@@ -358 +358 @@
                 $exit_required = true;
             }
-        } else if ( empty($this->query_vars['feed']) ) {
+        } elseif ( empty( $this->query_vars['feed'] ) ) {
             $headers['Content-Type'] = get_option('html_type') . '; charset=' . get_option('blog_charset');
         } else {