From ab0b51a1fef87bcc643c3aaf2e635c811b28ccd8 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 15 Feb 2011 06:10:59 -0500
Subject: [PATCH] - Use only one from IMAP authentication methods to prevent login delays (1487784)
---
program/steps/settings/edit_folder.inc | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/program/steps/settings/edit_folder.inc b/program/steps/settings/edit_folder.inc
index 3a7c0d9..36e3df0 100644
--- a/program/steps/settings/edit_folder.inc
+++ b/program/steps/settings/edit_folder.inc
@@ -5,7 +5,7 @@
| program/steps/settings/edit_folder.inc |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland |
+ | Copyright (C) 2005-2009, The Roundcube Dev Team |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
@@ -39,9 +39,7 @@
$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')
- || $IMAP->get_capability('thread=orderedsubject')
- || $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)) {
@@ -248,7 +246,7 @@
$content = $table->show();
}
else {
- $content = $tag['content'];
+ $content = $form['content'];
}
return $content;
--
Gitblit v1.9.1