diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcmail.php | 4 | ||||
| -rw-r--r-- | program/include/rcube_imap.php | 10 |
2 files changed, 3 insertions, 11 deletions
diff --git a/program/include/rcmail.php b/program/include/rcmail.php index afcc33af8..22ec20b90 100644 --- a/program/include/rcmail.php +++ b/program/include/rcmail.php @@ -301,10 +301,6 @@ class rcmail if (!($this->output instanceof rcube_template)) $this->output = new rcube_template($this->task, $framed); - foreach (array('flag_for_deletion','read_when_deleted') as $js_config_var) { - $this->output->set_env($js_config_var, $this->config->get($js_config_var)); - } - // set keep-alive/check-recent interval if ($keep_alive = $this->config->get('keep_alive')) { // be sure that it's less than session lifetime diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index fe2f770f2..7b24d2307 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -1627,13 +1627,9 @@ class rcube_imap // send expunge command in order to have the moved message // really deleted from the source mailbox if ($moved) { - // but only when flag_for_deletion is set to false - if (!rcmail::get_instance()->config->get('flag_for_deletion', false)) - { - $this->_expunge($from_mbox, FALSE, $a_uids); - $this->_clear_messagecount($from_mbox); - $this->_clear_messagecount($to_mbox); - } + $this->_expunge($from_mbox, FALSE, $a_uids); + $this->_clear_messagecount($from_mbox); + $this->_clear_messagecount($to_mbox); } // moving failed else if (rcmail::get_instance()->config->get('delete_always', false)) { |