Ticket #11152: 11152.diff

wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -82 +82 @@
 
                 //Set the Connection to use Passive FTP
                 @ftp_pasv( $this->link, true );
-                if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FTP_TIMEOUT )
-                        @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FTP_TIMEOUT);
+                if ( @ftp_get_option($this->link, FTP_TIMEOUT_SEC) < FS_TIMEOUT )
+                        @ftp_set_option($this->link, FTP_TIMEOUT_SEC, FS_TIMEOUT);
 
                 return true;
         }

wp-admin/includes/file.php

@@ -738 +734 @@
                 unset($credentials['port']);
         }
 
-        if ( defined('FTP_SSH') || (defined('FS_METHOD') && 'ssh' == FS_METHOD) )
+        if ( (defined('FTP_SSH') && FTP_SSH) || (defined('FS_METHOD') && 'ssh' == FS_METHOD) )
                 $credentials['connection_type'] = 'ssh';
-        else if ( defined('FTP_SSL') && 'ftpext' == $type ) //Only the FTP Extension understands SSL
+        else if ( (defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type ) //Only the FTP Extension understands SSL
                 $credentials['connection_type'] = 'ftps';
         else if ( !empty($_POST['connection_type']) )
                 $credentials['connection_type'] = stripslashes($_POST['connection_type']);
@@ -837 +833 @@
 <fieldset><legend class="screen-reader-text"><span><?php _e('Connection Type') ?></span></legend>
 <?php
 
-        $disabled = defined('FTP_SSL') || defined('FTP_SSH') ? '' : ' disabled="disabled"';
+        $disabled = (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH) ? ' disabled="disabled"' : '';
 
         foreach ( $types as $name => $text ) : ?>
         <label for="<?php echo esc_attr($name) ?>">