diff options
| author | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-07-21 07:55:20 +0000 |
|---|---|---|
| committer | thomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-07-21 07:55:20 +0000 |
| commit | e85a2601ec7c982affc753dca6c582c68987c412 (patch) | |
| tree | e8dbbe17b10d0ae10945605a4d8a49f625e644c8 | |
| parent | 0e2871dc33fc6289260a7be69e68c56cd3c15f71 (diff) | |
Fix default IMAP port configuration (#1486864)
git-svn-id: https://svn.roundcube.net/trunk@3819 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 2 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcmail.php | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 4c66adba5..28abdf8b7 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -1,6 +1,8 @@ CHANGELOG RoundCube Webmail =========================== +- Fix default IMAP port configuration (#1486864) +- Create Sent folder when starting to compose a new message (#1486802) - Fix handling of messages with Content-Type: application/* and no filename (#1484050) - Improved compose screen: resizable body and attachments list, vertical splitter, options menu - Fix RC forgets search results (#1483883) diff --git a/roundcubemail/program/include/rcmail.php b/roundcubemail/program/include/rcmail.php index d644f4f09..3fa2fa2cc 100644 --- a/roundcubemail/program/include/rcmail.php +++ b/roundcubemail/program/include/rcmail.php @@ -585,7 +585,7 @@ class rcmail $imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? $a_host['scheme'] : null; if(!empty($a_host['port'])) $imap_port = $a_host['port']; - else if ($imap_ssl && $imap_ssl != 'tls') + else if ($imap_ssl && $imap_ssl != 'tls' && (!$config['default_port'] || $config['default_port'] == 143)) $imap_port = 993; } |