Changeset 12268

Timestamp:

11/23/2009 09:52:13 PM (15 years ago)

Author:

ryan

Message:

Fix wpfs root dir location. Props dd32. fixes #11152

Location:

trunk/wp-admin/includes

Files:

• class-wp-filesystem-ftpext.php (modified) (1 diff)
• file.php (modified) (2 diffs)

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

@@ -83 +83 @@
         //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;

trunk/wp-admin/includes/file.php

@@ -739 +739 @@
     }
 
-    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']) )
@@ -838 +838 @@
 <?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 ) : ?>