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

trunk/src/wp-admin/includes/file.php

@@ -930 +930 @@
                 $method = 'direct';
                 $GLOBALS['_wp_filesystem_direct_method'] = 'file_owner';
-            } else if ( $allow_relaxed_file_ownership ) {
+            } elseif ( $allow_relaxed_file_ownership ) {
                 // The $context directory is writable, and $allow_relaxed_file_ownership is set, this means we can modify files
                 // safely in this directory. This mode doesn't create new files, only alter existing ones.
@@ -1039 +1039 @@
     }
 
-    if ( ( defined('FTP_SSH') && FTP_SSH ) || ( defined('FS_METHOD') && 'ssh2' == FS_METHOD ) )
+    if ( ( defined( 'FTP_SSH' ) && FTP_SSH ) || ( defined( 'FS_METHOD' ) && 'ssh2' == FS_METHOD ) ) {
         $credentials['connection_type'] = 'ssh';
-    else if ( (defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type ) //Only the FTP Extension understands SSL
+    } elseif ( ( defined( 'FTP_SSL' ) && FTP_SSL ) && 'ftpext' == $type ) { //Only the FTP Extension understands SSL
         $credentials['connection_type'] = 'ftps';
-    else if ( !empty($_POST['connection_type']) )
+    } elseif ( ! empty( $_POST['connection_type'] ) ) {
         $credentials['connection_type'] = wp_unslash( $_POST['connection_type'] );
-    else if ( !isset($credentials['connection_type']) ) //All else fails (And it's not defaulted to something else saved), Default to FTP
+    } elseif ( ! isset( $credentials['connection_type'] ) ) { //All else fails (And it's not defaulted to something else saved), Default to FTP
         $credentials['connection_type'] = 'ftp';
-
+    }
     if ( ! $error &&
             (