sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

git-svn-id: https://develop.svn.wordpress.org/trunk@27546 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Dion Hulse 2014-03-15 03:08:47 +00:00
parent 0fdb6dadfb
commit 526bf7d352
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wp-admin/includes/file.php
View File

@ -881,7 +881,7 @@ function WP_Filesystem( $args = false, $context = false ) {
* Note that the return value of this function can be overridden in 2 ways * Note that the return value of this function can be overridden in 2 ways
* - By defining FS_METHOD in your <code>wp-config.php</code> file * - By defining FS_METHOD in your <code>wp-config.php</code> file
* - By using the filesystem_method filter * - By using the filesystem_method filter
* Valid values for these are: 'direct', 'ssh', 'ftpext' or 'ftpsockets' * Valid values for these are: 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
* Plugins may also define a custom transport handler, See the WP_Filesystem function for more information. * Plugins may also define a custom transport handler, See the WP_Filesystem function for more information.
* *
* @since 2.5.0 * @since 2.5.0
@ -891,7 +891,7 @@ function WP_Filesystem( $args = false, $context = false ) {
* @return string The transport to use, see description for valid return values. * @return string The transport to use, see description for valid return values.
*/ */
function get_filesystem_method($args = array(), $context = false) { function get_filesystem_method($args = array(), $context = false) {
$method = defined('FS_METHOD') ? FS_METHOD : false; //Please ensure that this is either 'direct', 'ssh', 'ftpext' or 'ftpsockets' $method = defined('FS_METHOD') ? FS_METHOD : false; // Please ensure that this is either 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
if ( ! $method && function_exists('getmyuid') && function_exists('fileowner') ){ if ( ! $method && function_exists('getmyuid') && function_exists('fileowner') ){
if ( !$context ) if ( !$context )
@ -971,7 +971,7 @@ function request_filesystem_credentials($form_post, $type = '', $error = false,
unset($credentials['port']); unset($credentials['port']);
} }
if ( (defined('FTP_SSH') && FTP_SSH) || (defined('FS_METHOD') && 'ssh' == FS_METHOD) ) if ( ( defined('FTP_SSH') && FTP_SSH ) || ( defined('FS_METHOD') && 'ssh2' == FS_METHOD ) )
$credentials['connection_type'] = 'ssh'; $credentials['connection_type'] = 'ssh';
else if ( (defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type ) //Only the FTP Extension understands SSL else if ( (defined('FTP_SSL') && FTP_SSL) && 'ftpext' == $type ) //Only the FTP Extension understands SSL
$credentials['connection_type'] = 'ftps'; $credentials['connection_type'] = 'ftps';