Make WordPress Core


Ignore:
Timestamp:
03/15/2014 03:08:47 AM (10 years ago)
Author:
dd32
Message:

WP_Filesystem: Update request_filesystem_credentials() to handle the correct ssh value of FS_METHOD. Props jnielsendotnet. Fixes #27265

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/file.php

    r27319 r27546  
    882882 *  - By defining FS_METHOD in your <code>wp-config.php</code> file
    883883 *  - By using the filesystem_method filter
    884  * Valid values for these are: 'direct', 'ssh', 'ftpext' or 'ftpsockets'
     884 * Valid values for these are: 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
    885885 * Plugins may also define a custom transport handler, See the WP_Filesystem function for more information.
    886886 *
     
    892892 */
    893893function get_filesystem_method($args = array(), $context = false) {
    894     $method = defined('FS_METHOD') ? FS_METHOD : false; //Please ensure that this is either 'direct', 'ssh', 'ftpext' or 'ftpsockets'
     894    $method = defined('FS_METHOD') ? FS_METHOD : false; // Please ensure that this is either 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
    895895
    896896    if ( ! $method && function_exists('getmyuid') && function_exists('fileowner') ){
     
    972972    }
    973973
    974     if ( (defined('FTP_SSH') && FTP_SSH) || (defined('FS_METHOD') && 'ssh' == FS_METHOD) )
     974    if ( ( defined('FTP_SSH') && FTP_SSH ) || ( defined('FS_METHOD') && 'ssh2' == FS_METHOD ) )
    975975        $credentials['connection_type'] = 'ssh';
    976976    else if ( (defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type ) //Only the FTP Extension understands SSL
Note: See TracChangeset for help on using the changeset viewer.