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/settings/func.inc | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index daa9faf..fb48e92 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.inc @@ -334,9 +334,7 @@ } $RCMAIL->imap_connect(); - $threading_supported = $RCMAIL->imap->get_capability('thread=references') - || $RCMAIL->imap->get_capability('thread=orderedsubject') - || $RCMAIL->imap->get_capability('thread=refs'); + $threading_supported = $RCMAIL->imap->get_capability('THREAD'); if (!isset($no_override['autoexpand_threads']) && $threading_supported) { $field_id = 'rcmfd_autoexpand_threads'; @@ -346,8 +344,8 @@ $select_autoexpand_threads->add(rcube_label('expand_only_unread'), 2); $blocks['main']['options']['autoexpand_threads'] = array( - 'title' => html::label($field_id, Q(rcube_label('autoexpand_threads'))), - 'content' => $select_autoexpand_threads->show($config['autoexpand_threads']), + 'title' => html::label($field_id, Q(rcube_label('autoexpand_threads'))), + 'content' => $select_autoexpand_threads->show($config['autoexpand_threads']), ); } -- Gitblit v1.9.1