From 600bb156f79908e0ca72a039c6ad290146a2eb4e Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Tue, 04 Jan 2011 06:16:54 -0500 Subject: [PATCH] - Use improved get_capability() syntax, saves CAPABILITY call in some cases --- program/steps/mail/func.inc | 8 ++------ 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index d4e250b..abf1122 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -102,14 +102,10 @@ // set current mailbox and some other vars in client environment $OUTPUT->set_env('mailbox', $mbox_name); $OUTPUT->set_env('pagesize', $IMAP->page_size); - $OUTPUT->set_env('quota', $IMAP->get_capability('quota')); + $OUTPUT->set_env('quota', $IMAP->get_capability('QUOTA')); $OUTPUT->set_env('delimiter', $IMAP->get_hierarchy_delimiter()); $OUTPUT->set_env('threading', (bool) $IMAP->threading); - $OUTPUT->set_env('threads', $IMAP->threading - || $IMAP->get_capability('thread=references') - || $IMAP->get_capability('thread=orderedsubject') - || $IMAP->get_capability('thread=refs') - ); + $OUTPUT->set_env('threads', $IMAP->threading || $IMAP->get_capability('THREAD')); if ($CONFIG['flag_for_deletion']) $OUTPUT->set_env('flag_for_deletion', true); -- Gitblit v1.9.1