summaryrefslogtreecommitdiff
path: root/modules/system/system.module
diff options
context:
space:
mode:
Diffstat (limited to 'modules/system/system.module')
-rw-r--r--modules/system/system.module17
1 files changed, 4 insertions, 13 deletions
diff --git a/modules/system/system.module b/modules/system/system.module
index bc582e6ff..499612d71 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -1509,25 +1509,16 @@ function system_updater_info() {
function system_filetransfer_backends() {
$backends = array();
- //This is the default, will be available on most systems
- if (function_exists('ftp_connect')) {
- $backends['ftp_extension'] = array(
+ // This is the default, will be available on most systems.
+ if (function_exists('ftp_connect') || ini_get('allow_url_fopen')) {
+ $backends['ftp'] = array(
'title' => t('FTP'),
- 'class' => 'FileTransferFTPExtension',
+ 'class' => 'FileTransferFTP',
'settings_form' => 'system_filetransfer_backend_form_ftp',
'weight' => 0,
);
}
- if (ini_get('allow_url_fopen')) {
- $backends['ftp_wrapper'] = array(
- 'title' => t('FTP using file streams'),
- 'class' => 'FileTransferFTPWrapper',
- 'settings_form' => 'system_filetransfer_backend_form_ftp',
- 'weight' => 10,
- );
- }
-
// SSH2 lib connection is only available if the proper PHP extension is
// installed.
if (function_exists('ssh2_connect')) {