diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-12-27 11:48:50 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2010-12-27 11:48:50 +0000 |
| commit | ac7a03fa2f99c651096779bb33b8ec9e9d5b6fd5 (patch) | |
| tree | 4514b0af4421ff7f224af4d6e2b03ec45547faa4 | |
| parent | 939013d4bca76e89f988e8e9d2dc0bc770122acb (diff) | |
- Fix namespaces handling (#1487649)
git-svn-id: https://svn.roundcube.net/trunk@4369 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 1 | ||||
| -rw-r--r-- | roundcubemail/program/include/rcube_imap.php | 18 |
2 files changed, 7 insertions, 12 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index 320ec309b..722b8fec9 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -2,6 +2,7 @@ CHANGELOG Roundcube Webmail =========================== - Show the same message only once (#1487641) +- Fix namespaces handling (#1487649) RELEASE 0.5-RC -------------- diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php index 02efaff12..5e4d22824 100644 --- a/roundcubemail/program/include/rcube_imap.php +++ b/roundcubemail/program/include/rcube_imap.php @@ -3318,28 +3318,22 @@ class rcube_imap // If folder contains namespace prefix, don't modify it if (is_array($this->namespace['shared'])) { foreach ($this->namespace['shared'] as $ns) { - foreach ((array)$ns as $root) { - if ($root[0] && strpos($mbox_name, $root[0]) === 0) { - return $mbox_name; - } + if ($ns[0] && strpos($mbox_name, $ns[0]) === 0) { + return $mbox_name; } } } if (is_array($this->namespace['other'])) { foreach ($this->namespace['other'] as $ns) { - foreach ((array)$ns as $root) { - if ($root[0] && strpos($mbox_name, $root[0]) === 0) { - return $mbox_name; - } + if ($ns[0] && strpos($mbox_name, $ns[0]) === 0) { + return $mbox_name; } } } if (is_array($this->namespace['personal'])) { foreach ($this->namespace['personal'] as $ns) { - foreach ((array)$ns as $root) { - if ($root[0] && strpos($mbox_name, $root[0]) === 0) { - return $mbox_name; - } + if ($ns[0] && strpos($mbox_name, $ns[0]) === 0) { + return $mbox_name; } } // Add prefix if first personal namespace is non-empty |