bugfixes with folder listing

[squirrelmail.git] / src / folders.php

diff --git a/src/folders.php b/src/folders.php
index 67584317b591e4404ac5b13f5ea1f63ba47b6554..66bbc56aa88bed6efff7d28d511f0f0d3f540097 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -95,7 +95,7 @@
          for ($p = 0; $p < count($special_folders); $p++) {
             if ($boxes[$i]["unformatted"] == $special_folders[$p]) {
                $use_folder = false;
-            } else if (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder) {
+            } else if (($trash_folder) && (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder)) {
                $use_folder = false;
             }
          }
@@ -179,7 +179,7 @@
          for ($p = 0; $p < count($special_folders); $p++) {
             if ($boxes[$i]["unformatted"] == $special_folders[$p]) {
                $use_folder = false;
-            } else if (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder) {
+            } else if (($trash_folder) && (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder)) {
                $use_folder = false;
             }
          }
@@ -212,7 +212,7 @@
          for ($p = 0; $p < count($special_folders); $p++) {
             if ($boxes[$i]["unformatted"] == $special_folders[$p]) {
                $use_folder = false;
-            } else if (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder) {
+            } else if (($trash_folder) && (substr($boxes[$i]["unformatted"], 0, strlen($trash_folder)) == $trash_folder)) {
                $use_folder = false;
             }
          }