diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2003-05-11 16:21:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2003-05-11 16:21:35 +0000 |
| commit | 4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff (patch) | |
| tree | 477b69dc84a7ec7efc9c8de15b7b28b952320ec7 /phpBB/download.php | |
| parent | 30fd2486d82d50fecd4ba5ec6b81eebc4fcfdf49 (diff) | |
| download | forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.gz forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.bz2 forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.tar.xz forums-4d1def879aef2b97a2dfe65c13f2c3c8e6b53aff.zip | |
a few updates, added #539865 and #694413.
git-svn-id: file:///svn/phpbb/trunk@4005 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/download.php')
| -rw-r--r-- | phpBB/download.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/download.php b/phpBB/download.php index be3a2f3c4c..fc5845bb97 100644 --- a/phpBB/download.php +++ b/phpBB/download.php @@ -115,7 +115,7 @@ function send_file_to_browser($real_filename, $mimetype, $physical_filename, $up $gotit = FALSE; - if (!intval($config['allow_ftp_upload'])) + if (!intval($config['use_ftp_upload'])) { if (@!file_exists($filename)) { @@ -215,7 +215,7 @@ function send_file_to_browser($real_filename, $mimetype, $physical_filename, $up } readfile($filename); } -/* else if ((!$gotit) && (intval($config['allow_ftp_upload']))) +/* else if ((!$gotit) && (intval($config['use_ftp_upload']))) { $conn_id = attach_init_ftp(); @@ -353,7 +353,7 @@ if (!$thumbnail) // Determine the 'presenting'-method if ($download_mode == PHYSICAL_LINK) { - if (intval($config['allow_ftp_upload']) && $config['upload_dir'] == '') + if (intval($config['use_ftp_upload']) && $config['upload_dir'] == '') { trigger_error('Physical Download not possible with the current Attachment Setting'); } @@ -362,7 +362,7 @@ if ($download_mode == PHYSICAL_LINK) } else { - if (intval($config['allow_ftp_upload'])) + if (intval($config['use_ftp_upload'])) { // We do not need a download path, we are not downloading physically send_file_to_browser($attachment['real_filename'], $attachment['mimetype'], $attachment['physical_filename'] , '', $attachment['attach_id']); |