mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
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
This commit is contained in:
parent
2bb2e4a43b
commit
81e67fbef1
2 changed files with 9 additions and 0 deletions
|
@ -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>
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Add table
Reference in a new issue