From 96c946ee6ced0a9a68ef251528a3f900d5a01396 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Wed, 21 Dec 2011 10:07:42 +0000
Subject: - Applied fixes from trunk up to r5633

---
 program/steps/settings/folders.inc | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'program/steps/settings')

diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index 77cbb5571..3fc366d1c 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -293,10 +293,12 @@ function rcube_subscription_form($attrib)
         if (!$disabled && $folder['virtual'] && $folder['level'] == 0 && !empty($namespace)) {
             $fname = $folder['id'] . $delimiter;
             foreach ($namespace as $ns) {
-                foreach ($ns as $item) {
-                    if ($item[0] === $fname) {
-                        $disabled = true;
-                        break 2;
+                if (is_array($ns)) {
+                    foreach ($ns as $item) {
+                        if ($item[0] === $fname) {
+                            $disabled = true;
+                            break 2;
+                        }
                     }
                 }
             }
-- 
cgit v1.2.3