From c321a955a7b0f6d6b13ffaebf040a6c7091037ae Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 16 Jan 2012 10:14:41 -0500
Subject: [PATCH] Merged devel-framework branch (r5746:5779) back into trunk
---
program/steps/mail/folders.inc | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/program/steps/mail/folders.inc b/program/steps/mail/folders.inc
index 6e687b0..2aa83ee 100644
--- a/program/steps/mail/folders.inc
+++ b/program/steps/mail/folders.inc
@@ -27,7 +27,7 @@
// send EXPUNGE command
if ($RCMAIL->action == 'expunge') {
- $success = $RCMAIL->imap->expunge($mbox);
+ $success = $RCMAIL->storage->expunge_folder($mbox);
// reload message list if current mailbox
if ($success) {
@@ -48,7 +48,7 @@
// clear mailbox
else if ($RCMAIL->action == 'purge')
{
- $delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
+ $delimiter = $RCMAIL->storage->get_hierarchy_delimiter();
$trash_regexp = '/^' . preg_quote($CONFIG['trash_mbox'] . $delimiter, '/') . '/';
$junk_regexp = '/^' . preg_quote($CONFIG['junk_mbox'] . $delimiter, '/') . '/';
@@ -56,7 +56,7 @@
if ($mbox == $CONFIG['trash_mbox'] || $mbox == $CONFIG['junk_mbox']
|| preg_match($trash_regexp, $mbox) || preg_match($junk_regexp, $mbox)
) {
- $success = $RCMAIL->imap->clear_mailbox($mbox);
+ $success = $RCMAIL->storage->clear_folder($mbox);
if ($success) {
$OUTPUT->show_message('folderpurged', 'confirmation');
--
Gitblit v1.9.1