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

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

@@ -894 +894 @@
         $r = wp_parse_args( $args, $defaults );
 
-        if ( isset($r['headers']['User-Agent']) ) {
+        if ( isset( $r['headers']['User-Agent'] ) ) {
             $r['user-agent'] = $r['headers']['User-Agent'];
-            unset($r['headers']['User-Agent']);
-        } else if ( isset($r['headers']['user-agent']) ) {
+            unset( $r['headers']['User-Agent'] );
+        } elseif ( isset( $r['headers']['user-agent'] ) ) {
             $r['user-agent'] = $r['headers']['user-agent'];
-            unset($r['headers']['user-agent']);
+            unset( $r['headers']['user-agent'] );
         }
 
@@ -1359 +1359 @@
         $r = wp_parse_args( $args, $defaults );
 
-        if ( isset($r['headers']['User-Agent']) ) {
+        if ( isset( $r['headers']['User-Agent'] ) ) {
             $r['user-agent'] = $r['headers']['User-Agent'];
-            unset($r['headers']['User-Agent']);
-        } else if ( isset($r['headers']['user-agent']) ) {
+            unset( $r['headers']['User-Agent'] );
+        } elseif ( isset( $r['headers']['user-agent'] ) ) {
             $r['user-agent'] = $r['headers']['user-agent'];
-            unset($r['headers']['user-agent']);
+            unset( $r['headers']['user-agent'] );
         }
 
@@ -2245 +2245 @@
             if ( array_key_exists('content-encoding', $headers) && ! empty( $headers['content-encoding'] ) )
                 return true;
-        } else if ( is_string( $headers ) ) {
+        } elseif ( is_string( $headers ) ) {
             return ( stripos($headers, 'content-encoding:') !== false );
         }