summaryrefslogtreecommitdiff
path: root/program/steps/settings
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/settings
parenteabd44876c67239b1f27afc4acadf1d7e2001219 (diff)
- Use improved get_capability() syntax, saves CAPABILITY call in some cases
Diffstat (limited to 'program/steps/settings')
-rw-r--r--program/steps/settings/edit_folder.inc4
-rw-r--r--program/steps/settings/func.inc8
2 files changed, 4 insertions, 8 deletions
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index ca07b04bc..2842b356d 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -39,9 +39,7 @@ function rcube_folder_form($attrib)
$delimiter = $RCMAIL->imap->get_hierarchy_delimiter();
$special = (strlen($mbox_imap) && in_array($mbox_imap, (array) $RCMAIL->config->get('default_imap_folders')));
$protected = ($special && $RCMAIL->config->get('protect_default_folders'));
- $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');
// Get mailbox stats (messages count, etc.), mailbox name and parent
if (strlen($mbox)) {
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index daa9fafa6..fb48e926b 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -334,9 +334,7 @@ function rcmail_user_prefs($current=null)
}
$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 @@ function rcmail_user_prefs($current=null)
$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']),
);
}