Ticket #7690: 7690.3.diff

wp-admin/includes/file.php

@@ -480 +480 @@
                 unlink($temp_file);
         }
 
-        if ( isset($args['connection_type']) && 'ssh' == $args['connection_type'] ) {
+        if ( isset($args['connection_type']) && 'ssh' == $args['connection_type'] && extension_loaded('ssh') ) {
                 $method = 'SSH2';
                 return apply_filters('filesystem_method', $method);
         }
@@ -535 +535 @@
 ?>
 <form action="<?php echo $form_post ?>" method="post">
 <div class="wrap">
-<h2><?php _e('FTP Connection Information') ?></h2>
-<p><?php _e('To perform the requested action, FTP connection information is required.') ?></p>
+<h2><?php _e('Connection Information') ?></h2>
+<p><?php _e('To perform the requested action, connection information is required.') ?></p>
 <table class="form-table">
 <tr valign="top">
 <th scope="row"><label for="hostname"><?php _e('Hostname') ?></label></th>
@@ -556 +556 @@
 <fieldset><legend class="hidden"><?php _e('Connection Type') ?> </legend>
 <p><label><input name="connection_type"  type="radio" value="ftp" <?php checked('ftp', $connection_type); ?>    /> <?php _e('FTP') ?></label><br />
 <label><input name="connection_type" type="radio" value="ftps" <?php checked('ftps', $connection_type); ?> /> <?php _e('FTPS (SSL)') ?></label><br />
+<?php if ( extension_loaded('ssh') ) { ?>
 <label><input name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type); ?> /> <?php _e('SSH') ?></label></p>
+<?php } ?>
 </fieldset>
 </td>
 </tr>

wp-admin/update.php

@@ -27 +27 @@
                 return;
 
         if ( ! WP_Filesystem($credentials) ) {
-                $error = true;
-                if ( is_object($wp_filesystem) && $wp_filesystem->errors->get_error_code() )
-                        $error = $wp_filesystem->errors;
-                request_filesystem_credentials($url, '', $error); //Failed to connect, Error and request again
+                request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
                 return;
         }