diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-12-30 11:19:43 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-12-30 11:19:43 +0000 |
| commit | 40f62c9900cda3faba209712b770e82dafe17d0d (patch) | |
| tree | 8f4d4e85d3cc7c102a83a18b8abc548b89b83d14 | |
| parent | 63a189a66ba7a6e3fc927fe12f272792c6fe3302 (diff) | |
- Fix handling of INBOX when personal namespace prefix is non-empty (#1487657)
git-svn-id: https://svn.roundcube.net/trunk@4380 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 7aaa34a6d..4d695da0e 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -4,6 +4,7 @@ CHANGELOG Roundcube Webmail - Show the same message only once (#1487641) - Fix namespaces handling (#1487649) - Add handling of multifolder METADATA/ANNOTATION responses +- Fix handling of INBOX when personal namespace prefix is non-empty (#1487657) RELEASE 0.5-RC -------------- diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 5e4d22824..24c361c3f 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -3337,7 +3337,7 @@ class rcube_imap } } // Add prefix if first personal namespace is non-empty - if ($this->namespace['personal'][0][0]) { + if ($mbox_name != 'INBOX' && $this->namespace['personal'][0][0]) { return $this->namespace['personal'][0][0].$mbox_name; } } |