From 198fa13b2e2dd4d1e3d1e4478a04ee0286a64a8d Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Mon, 7 Dec 2009 15:15:17 -0700 Subject: [PATCH] Move session thread init to a more appropriate place --- imp/lib/Auth.php | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/imp/lib/Auth.php b/imp/lib/Auth.php index 0f506b0b5..aee362b11 100644 --- a/imp/lib/Auth.php +++ b/imp/lib/Auth.php @@ -81,14 +81,6 @@ class IMP_Auth throw new Horde_Auth_Exception($e->getMessage()); } - /* Set the IMAP threading algorithm. */ - $ptr = $GLOBALS['imp_imap']->loadServerConfig($credentials['server']); - if (strcasecmp($ptr['protocol'], 'imap') == 0) { - $_SESSION['imp']['imap']['thread'] = in_array(isset($ptr['thread']) ? strtoupper($ptr['thread']) : 'REFERENCES', $GLOBALS['imp_imap']->ob()->queryCapability('THREAD')) - ? 'REFERENCES' - : 'ORDEREDSUBJECT'; - } - return false; } @@ -431,6 +423,11 @@ class IMP_Auth } } } + + /* Set the IMAP threading algorithm. */ + $sess['imap']['thread'] = in_array(isset($ptr['thread']) ? strtoupper($ptr['thread']) : 'REFERENCES', $GLOBALS['imp_imap']->ob()->queryCapability('THREAD')) + ? 'REFERENCES' + : 'ORDEREDSUBJECT'; } /* Set the SMTP options, if needed. */ -- 2.11.0