Changeset 4131 in subversion

Timestamp:

Oct 25, 2010 6:49:53 AM (3 years ago)

Author:

alec

Message:

• Fix setting 'virtual' flag for non-existing folders in some cases

File:

• trunk/roundcubemail/program/include/main.inc (modified) (2 diffs)

trunk/roundcubemail/program/include/main.inc

@@ -1271 +1271 @@
       rcmail_build_folder_tree($a_mailboxes, $folder, $delimiter);
   }
-  
+
   // allow plugins to alter the folder tree or to localize folder names
   $hook = $RCMAIL->plugins->exec_hook('render_mailboxlist', array('list' => $a_mailboxes, 'delimiter' => $delimiter));
@@ -1334 +1334 @@
 {
   $pos = strpos($folder, $delm);
+
   if ($pos !== false) {
     $subFolders = substr($folder, $pos+1);
     $currentFolder = substr($folder, 0, $pos);
-    $virtual = !isset($arrFolders[$currentFolder]);
+
+    // sometimes folder has a delimiter as the last character
+    if (empty($subFolders))
+      $virtual = false;
+    else if (!isset($arrFolders[$currentFolder]))
+      $virtual = true;
+    else
+      $virtual = $arrFolders[$currentFolder]['virtual'];
   }
   else {