IntenseWebs/WordPress
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This was a mess, is now standardized across the codebase, except for a few 3rd-party libs. 

See #30799.

Built from https://develop.svn.wordpress.org/trunk@31090


git-svn-id: http://core.svn.wordpress.org/trunk@31071 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor
2015-01-08 07:05:25 +00:00
parent a4ed093250
commit 60b0cd7943
49 changed files with 182 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wp-includes/wp-db.php
View File

@@ -1366,7 +1366,7 @@ class wpdb {
while ( mysqli_more_results( $this->dbh ) ) {
mysqli_next_result( $this->dbh );
}
} else if ( is_resource( $this->result ) ) {
} elseif ( is_resource( $this->result ) ) {
mysql_free_result( $this->result );
}
}
@@ -1435,9 +1435,9 @@ class wpdb {
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;
}
@@ -1475,7 +1475,7 @@ class wpdb {
" ), htmlspecialchars( $this->dbhost, ENT_QUOTES ) ), 'db_connect_fail' );
return false;
} else if ( $this->dbh ) {
} elseif ( $this->dbh ) {
$this->has_connected = true;
$this->set_charset( $this->dbh );
$this->ready = true;
@@ -1673,7 +1673,7 @@ class wpdb {
$this->last_result[$num_rows] = $row;
$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;
$num_rows++;