Delete in Trash does Purge. OndraS.

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

diff --git a/functions/imap_messages.php b/functions/imap_messages.php
index 9af572e9fb907efecee8fa80428abfe3fa1cb52b..3d6c8f0bb97122f4de742dabf163a80c2a6afe17 100755 (executable)
--- a/functions/imap_messages.php
+++ b/functions/imap_messages.php
@@ -21,7 +21,7 @@
    function sqimap_messages_delete ($imap_stream, $start, $end, $mailbox) {
       global $move_to_trash, $trash_folder, $auto_expunge;
 
-      if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder))) {
+      if (($move_to_trash == true) && (sqimap_mailbox_exists($imap_stream, $trash_folder) && ($mailbox != $trash_folder))) {
          sqimap_messages_copy ($imap_stream, $start, $end, $trash_folder);
          sqimap_messages_flag ($imap_stream, $start, $end, "Deleted");
       } else {