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

Timestamp:

01/08/2015 07:04:40 AM (12 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/wp-db.php (modified) (4 diffs)

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

@@ -1367 +1367 @@
                                 mysqli_next_result( $this->dbh );
                         }
-                } else if ( is_resource( $this->result ) ) {
+                } elseif ( is_resource( $this->result ) ) {
                         mysql_free_result( $this->result );
                 }
@@ -1436 +1436 @@
                                 if ( $this->has_connected ) {
                                         $attempt_fallback = false;
-                                } else if ( defined( 'WP_USE_EXT_MYSQL' ) && ! WP_USE_EXT_MYSQL ) {
+                                } elseif ( defined( 'WP_USE_EXT_MYSQL' ) && ! WP_USE_EXT_MYSQL ) {
                                         $attempt_fallback = false;
-                                } else if ( ! function_exists( 'mysql_connect' ) ) {
+                                } elseif ( ! function_exists( 'mysql_connect' ) ) {
                                         $attempt_fallback = false;
                                 }
@@ -1476 +1476 @@
 
                         return false;
-                } else if ( $this->dbh ) {
+                } elseif ( $this->dbh ) {
                         $this->has_connected = true;
                         $this->set_charset( $this->dbh );
@@ -1674 +1674 @@
                                         $num_rows++;
                                 }
-                        } else if ( is_resource( $this->result ) ) {
+                        } elseif ( is_resource( $this->result ) ) {
                                 while ( $row = @mysql_fetch_object( $this->result ) ) {
                                         $this->last_result[$num_rows] = $row;