From 112c9133bb8dc3b4e8f1d47241fa57c86dd5065c Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sun, 05 Oct 2008 03:18:15 -0400
Subject: [PATCH] - removed deprecated rcube_add_label() and all uses - code for 'show' action added in r1937 moved to show.inc
---
program/steps/mail/func.inc | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index b7ef82c..a5ffb9d 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -69,18 +69,9 @@
$OUTPUT->set_env('junk_mailbox', $CONFIG['junk_mbox']);
if (!$OUTPUT->ajax_call)
- rcube_add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
+ $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
$OUTPUT->set_pagetitle(rcmail_localize_foldername($IMAP->get_mailbox_name()));
- }
-else if ($RCMAIL->action == 'show')
- {
- // set current mailbox in client environment
- $OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name());
- if ($CONFIG['trash_mbox'])
- $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
- if (!$OUTPUT->ajax_call)
- rcube_add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
}
@@ -99,7 +90,7 @@
$sort_order = $_SESSION['sort_order'];
// add some labels to client
- rcube_add_label('from', 'to');
+ $OUTPUT->add_label('from', 'to');
// get message headers
$a_headers = $IMAP->list_headers('', '', $sort_col, $sort_order);
--
Gitblit v1.9.1