diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-07-22 01:26:09 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-07-22 01:26:09 +0000 |
| commit | 81e67fbef141ea47249b5f9d1a4e1cb34263b248 (patch) | |
| tree | 7c24b3b3471be5a6096c4b1f8f383bd28624a144 | |
| parent | 2bb2e4a43b30bd3a686106865c84786de42d50e8 (diff) | |
| download | forums-81e67fbef141ea47249b5f9d1a4e1cb34263b248.tar forums-81e67fbef141ea47249b5f9d1a4e1cb34263b248.tar.gz forums-81e67fbef141ea47249b5f9d1a4e1cb34263b248.tar.bz2 forums-81e67fbef141ea47249b5f9d1a4e1cb34263b248.tar.xz forums-81e67fbef141ea47249b5f9d1a4e1cb34263b248.zip | |
Fix bug #46295 - Be less strict with FTP daemons when getting directory filelists.
Authorised by: bantu ;-)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9820 89ea8834-ac86-4346-8a33-228a782c2dd0
| -rw-r--r-- | phpBB/docs/CHANGELOG.html | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_transfer.php | 8 |
2 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index 8b5da10c72..356987cd33 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -169,6 +169,7 @@ <li>[Fix] Display required fields notice on registration above the custom profile fields. (Bug #39665)</li> <li>[Fix] Copy poll options properly when copying topic. (Bug #39065)</li> <li>[Fix] Preserve newlines in template files (one newline had been always dropped after a template variable due to PHP's handling of closing tags)</li> + <li>[Fix] Be less strict with FTP daemons when getting directory filelists. (Bug #46295)</li> <li>[Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.</li> <li>[Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)</li> <li>[Change] Template engine now permits to a limited extent variable includes.</li> diff --git a/phpBB/includes/functions_transfer.php b/phpBB/includes/functions_transfer.php index 2146d5fa0b..c1211eda52 100644 --- a/phpBB/includes/functions_transfer.php +++ b/phpBB/includes/functions_transfer.php @@ -462,6 +462,14 @@ class ftp extends transfer { $list = @ftp_nlist($this->connection, $dir); + // See bug #46295 - Some FTP daemons don't like './' + if ($dir === './') + { + // Let's try some alternatives + $list = (empty($list)) ? @ftp_nlist($this->connection, '.') : $list; + $list = (empty($list)) ? @ftp_nlist($this->connection, '') : $list; + } + // Return on error if ($list === false) { |