Changeset 1c7b94b5 in github

Timestamp:

Dec 27, 2010 6:48:50 AM (2 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

dd944d9

Parents:

f811dab

Message:

• Fix namespaces handling (#1487649)

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_imap.php (modified) (3 diffs)

CHANGELOG

@@ -3 +3 @@
 
 - Show the same message only once (#1487641)
+- Fix namespaces handling (#1487649)
 
 RELEASE 0.5-RC

program/include/rcube_imap.php

@@ -3319 +3319 @@
             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;
                     }
                 }
@@ -3328 +3326 @@
             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;
                     }
                 }
@@ -3337 +3333 @@
             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;
                     }
                 }