bug fixes from previous commit

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11890 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/templates/default/left_main.tpl b/templates/default/left_main.tpl
index 92e903034c950d89c853f09c85195b603a45bc81..2a251f56dc8a344a6a6ddd9279dd5457dec4e3c6 100644 (file)
--- a/templates/default/left_main.tpl
+++ b/templates/default/left_main.tpl
@@ -139,7 +139,7 @@ function buildMailboxTree ($box, $settings, $icon_theme_path, $indent_factor=0)
      * image based on whatever logic they see fit here.
      */
     $folder_icon = '';
-    if (!is_null($settings['iconThemePath'])) {
+    if (!is_null($icon_theme_path)) {
         switch (true) {
             case $box['IsInbox']:
                 $folder_icon = getIcon($icon_theme_path, 'inbox.png', '', $box['MailboxName']);
@@ -248,7 +248,7 @@ function buildMailboxTree ($box, $settings, $icon_theme_path, $indent_factor=0)
 
     if (!$box['IsCollapsed'] || $box['IsRoot']) {
         for ($i = 0; $i<sizeof($box['ChildBoxes']); $i++) {
-            $out .= buildMailboxTree($box['ChildBoxes'][$i], $settings, $indent_factor);
+            $out .= buildMailboxTree($box['ChildBoxes'][$i], $settings, $icon_theme_path, $indent_factor);
         }
     }