WordPress.org

Make WordPress Core

Ticket #10093: 10093.diff

File 10093.diff, 1.4 KB (added by ShaneF, 9 years ago)
  • wp-admin/includes/class-wp-filesystem-ssh2.php

     
    3333 * Restart Apache!
    3434 * Check phpinfo() streams to confirm that: ssh2.shell, ssh2.exec, ssh2.tunnel, ssh2.scp, ssh2.sftp  exist.
    3535 *
     36 * As of WordPress 2.8, the PHP must be complied with '--enable-sockets' for this to work.
    3637 *
    3738 * @since 2.7
    3839 * @package WordPress
  • wp-admin/includes/file.php

     
    781781<?php if ( 'ftpext' == $type ) : ?>
    782782<br /><label><input id="ftps" name="connection_type" type="radio" value="ftps" <?php checked('ftps', $connection_type); if ( defined('FTP_SSL') || defined('FTP_SSH') ) echo ' disabled="disabled"';  ?>/> <?php _e('FTPS (SSL)') ?></label>
    783783<?php endif; ?>
    784 <?php if ( extension_loaded('ssh2') ) : ?>
     784<?php if ( extension_loaded('ssh2') && extension_loaded('sockets') ) : ?>
    785785<br /><label><input id="ssh" name="connection_type" type="radio" value="ssh" <?php checked('ssh', $connection_type);  if ( defined('FTP_SSL') || defined('FTP_SSH') ) echo ' disabled="disabled"'; ?>/> <?php _e('SSH') ?></label>
    786786<?php endif; ?>
    787787</fieldset>