From ac7a03fa2f99c651096779bb33b8ec9e9d5b6fd5 Mon Sep 17 00:00:00 2001 From: alec Date: Mon, 27 Dec 2010 11:48:50 +0000 Subject: - Fix namespaces handling (#1487649) git-svn-id: https://svn.roundcube.net/trunk@4369 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/program/include/rcube_imap.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'roundcubemail/program/include') 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 -- cgit v1.2.3