From 39165e2fb0caef9d8efe298d35d4fea43415fee2 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Mon, 8 Nov 2010 12:55:48 +0000
Subject: - Fix operations on messages in unsubscribed folders (#1487107)

git-svn-id: https://svn.roundcube.net/trunk@4194 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/CHANGELOG                      | 1 +
 roundcubemail/program/include/rcube_imap.php | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG
index c17ad8fcc..de5c1494d 100644
--- a/roundcubemail/CHANGELOG
+++ b/roundcubemail/CHANGELOG
@@ -64,6 +64,7 @@ CHANGELOG Roundcube Webmail
 - Add 'loading' message on message move/copy/delete/mark actions
 - Improve responsiveness of messages displaying (#1486986)
 - Add option for minimum length of autocomplete's string (#1486428)
+- Fix operations on messages in unsubscribed folder (#1487107)
 
 RELEASE 0.4.2
 -------------
diff --git a/roundcubemail/program/include/rcube_imap.php b/roundcubemail/program/include/rcube_imap.php
index aa6521af8..acf0aa0e0 100644
--- a/roundcubemail/program/include/rcube_imap.php
+++ b/roundcubemail/program/include/rcube_imap.php
@@ -2462,7 +2462,7 @@ class rcube_imap
         $mailbox = $this->mod_mailbox($mbox_name);
 
         // make sure mailbox exists
-        if ($this->mailbox_exists($mbox_name, true)) {
+        if ($this->mailbox_exists($mbox_name)) {
             if ($is_file)
                 $saved = $this->conn->appendFromFile($mailbox, $message, $headers);
             else
@@ -2500,7 +2500,7 @@ class rcube_imap
             return false;
 
         // make sure mailbox exists
-        if ($to_mbox != 'INBOX' && !$this->mailbox_exists($tbox, true)) {
+        if ($to_mbox != 'INBOX' && !$this->mailbox_exists($tbox)) {
             if (in_array($tbox, $this->default_folders))
                 $this->create_mailbox($tbox, true);
             else
@@ -2581,7 +2581,7 @@ class rcube_imap
         }
 
         // make sure mailbox exists
-        if ($to_mbox != 'INBOX' && !$this->mailbox_exists($tbox, true)) {
+        if ($to_mbox != 'INBOX' && !$this->mailbox_exists($tbox)) {
             if (in_array($tbox, $this->default_folders))
                 $this->create_mailbox($tbox, true);
             else
-- 
cgit v1.2.3