X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Ffolders_delete.php;h=c65fcabd4f0a22e5bc528b3eb5d05849e738d8df;hb=dfdeb892223cac1ec1147ea8387afa6876ff3716;hp=1a96fc26f817f47a49cf6ba4989ca8c4d548cf88;hpb=4eb9284bbae330fe6225ead656ef76505c3463f0;p=squirrelmail.git diff --git a/src/folders_delete.php b/src/folders_delete.php index 1a96fc26..c65fcabd 100644 --- a/src/folders_delete.php +++ b/src/folders_delete.php @@ -3,10 +3,10 @@ /** * folders_delete.php * - * Copyright (c) 1999-2004 The SquirrelMail Project Team + * Copyright (c) 1999-2005 The SquirrelMail Project Team * Licensed under the GNU GPL. For full terms see the file COPYING. * - * Deletes folders from the IMAP server. + * Deletes folders from the IMAP server. * Called from the folders.php * * @version $Id$ @@ -93,7 +93,7 @@ else /* Courier IMAP doesn't like subfolders of Trash * If global options say we can't move it into Trash * If it's already a subfolder of trash, we'll have to delete it */ -if (strtolower($imap_server_type) == 'courier' || +if (strtolower($imap_server_type) == 'courier' || (isset($delete_folder) && $delete_folder) || eregi('^'.$trash_folder.'.+', $mailbox) ) {