Ticket #7690: 7690.diff

wp-admin/includes/file.php

@@ -503 +503 @@
         $credentials['username'] = defined('FTP_USER') ? FTP_USER : (!empty($_POST['username']) ? $_POST['username'] : $credentials['username']);
         $credentials['password'] = defined('FTP_PASS') ? FTP_PASS : (!empty($_POST['password']) ? $_POST['password'] : $credentials['password']);
         $credentials['ssl']      = defined('FTP_SSL')  ? FTP_SSL  : ( isset($_POST['ssl'])      ? $_POST['ssl']      : $credentials['ssl']);
+        $credentials['sftp']      = defined('FTP_SFTP')  ? FTP_SFTP  : ( isset($_POST['sftp'])  ? $_POST['sftp']      : $credentials['sftp']);
 
         if ( ! $error && !empty($credentials['password']) && !empty($credentials['username']) && !empty($credentials['hostname']) ) {
                 $stored_credentials = $credentials;
@@ -549 +550 @@
 </select>
 </td>
 </tr>
+<tr valign="top">
+<th scope="row"><label for="ssl"><?php _e('Use SFTP:') ?></label></th>
+<td>
+<select name="ssl" id="ssl"<?php if( defined('FTP_SFTP') ) echo ' disabled="disabled"' ?>>
+<?php
+foreach ( array(0 => __('No'), 1 => __('Yes')) as $key => $value ) :
+        $selected = ($sftp == $value) ? 'selected="selected"' : '';
+        echo "\n\t<option value='$key' $selected>" . $value . '</option>';
+endforeach;
+?>
+</select>
+</td>
+</tr>
 </table>
 <p class="submit">
 <input type="submit" name="submit" value="<?php _e('Proceed'); ?>" />