From ed1d212ae2daea5e4bd043417610177093e99f19 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 16 Jan 2016 03:03:51 -0500
Subject: [PATCH] Improved SVG cleanup code

---
 program/steps/settings/folders.inc |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/program/steps/settings/folders.inc b/program/steps/settings/folders.inc
index 14e41d6..034b807 100644
--- a/program/steps/settings/folders.inc
+++ b/program/steps/settings/folders.inc
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  +-----------------------------------------------------------------------+
  | program/steps/settings/folders.inc                                    |
  |                                                                       |
@@ -265,11 +265,10 @@
 
     $js_folders = array();
     $folders    = array();
-    $collapsed  = $RCMAIL->config->get('collapsed_folders');
+    $collapsed  = (string) $RCMAIL->config->get('collapsed_folders');
 
     // create list of available folders
     foreach ($list_folders as $i => $folder) {
-        $idx        = $i + 1;
         $sub_key    = array_search($folder['id'], $a_subscribed);
         $subscribed = $sub_key !== false;
         $protected  = $protect_default && isset($special_folders[$folder['id']]);
@@ -286,7 +285,7 @@
         // Check \Noselect flag (of existing folder)
         if (!$protected && in_array($folder['id'], $a_unsubscribed)) {
             $attrs = $STORAGE->folder_attributes($folder['id']);
-            $noselect = in_array('\\Noselect', $attrs);
+            $noselect = in_array_nocase('\\Noselect', $attrs);
         }
 
         $disabled = (($protected && $subscribed) || $noselect);

--
Gitblit v1.9.1