summaryrefslogtreecommitdiff
path: root/program/steps/mail/func.inc
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2011-01-04 11:16:54 +0000
committeralecpl <alec@alec.pl>2011-01-04 11:16:54 +0000
commit600bb156f79908e0ca72a039c6ad290146a2eb4e (patch)
tree903b2d054b14b7789241638ba2132fb66eac82b9 /program/steps/mail/func.inc
parenteabd44876c67239b1f27afc4acadf1d7e2001219 (diff)
- Use improved get_capability() syntax, saves CAPABILITY call in some cases
Diffstat (limited to 'program/steps/mail/func.inc')
-rw-r--r--program/steps/mail/func.inc8
1 files changed, 2 insertions, 6 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index d4e250b03..abf112212 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -102,14 +102,10 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') {
// 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);