Changeset 11495 for trunk/wp-admin/includes/class-wp-filesystem-ftpext.php

Timestamp:

05/30/2009 05:14:07 PM (16 years ago)

Author:

westi

Message:

Fix plugin/theme upgrade issues when using ftp extension. Fixes #9980 props DD32.

File:

• trunk/wp-admin/includes/class-wp-filesystem-ftpext.php (modified) (2 diffs)

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

@@ -48 +48 @@
 
         // Check if the options provided are OK.
-        if ( empty ($opt['username']) )
+        if ( empty($opt['username']) )
             $this->errors->add('empty_username', __('FTP username is required'));
         else
             $this->options['username'] = $opt['username'];
 
-        if ( empty ($opt['password']) )
+        if ( empty($opt['password']) )
             $this->errors->add('empty_password', __('FTP password is required'));
         else
@@ -59 +59 @@
 
         $this->options['ssl'] = false;
-        if ( isset($opt['ssl']) )
-            $this->options['ssl'] = ( !empty($opt['ssl']) );
-        elseif ( isset( $opt['connection_type']) )
-            $this->options['ssl'] = ( 'ftps' == $opt['connection_type'] );
+        if ( isset($opt['connection_type']) && 'ftps' == $opt['connection_type'] )
+            $this->options['ssl'] = true;
     }
 
     function connect() {
         if ( isset($this->options['ssl']) && $this->options['ssl'] && function_exists('ftp_ssl_connect') )
-            $this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'],$this->timeout);
-        else
-            $this->link = @ftp_connect($this->options['hostname'], $this->options['port'],$this->timeout);
+            $this->link = @ftp_ssl_connect($this->options['hostname'], $this->options['port'], $this->timeout);
+        else
+            $this->link = @ftp_connect($this->options['hostname'], $this->options['port'], $this->timeout);
 
         if ( ! $this->link ) {