From cfb5329ae89790633f93cd1633696a4ca71e40eb Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Fri, 13 Feb 2009 00:31:31 -0700 Subject: [PATCH] Status caching should be disabled by default --- framework/Imap_Client/lib/Horde/Imap/Client.php | 2 +- framework/Imap_Client/lib/Horde/Imap/Client/Base.php | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/framework/Imap_Client/lib/Horde/Imap/Client.php b/framework/Imap_Client/lib/Horde/Imap/Client.php index 1d060b270..79f61ea6c 100644 --- a/framework/Imap_Client/lib/Horde/Imap/Client.php +++ b/framework/Imap_Client/lib/Horde/Imap/Client.php @@ -55,7 +55,7 @@ * VALUES: false, 'ssl', 'tls'. * DEFAULT: No encryption * statuscache - (boolean) Cache STATUS responses? - * DEFAULT: True + * DEFAULT: False * timeout - (integer) Connection timeout, in seconds. * DEFAULT: 10 seconds * diff --git a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php index edff7f0be..76adc872a 100644 --- a/framework/Imap_Client/lib/Horde/Imap/Client/Base.php +++ b/framework/Imap_Client/lib/Horde/Imap/Client/Base.php @@ -115,10 +115,6 @@ abstract class Horde_Imap_Client_Base $params['timeout'] = 10; } - if (!isset($params['statuscache'])) { - $params['statuscache'] = true; - } - if (empty($params['cache'])) { $params['cache'] = array('fields' => array()); } elseif (empty($params['cache']['fields'])) { @@ -952,7 +948,7 @@ abstract class Horde_Imap_Client_Base /* Check for cached information. */ if (!$curr_mbox && - $this->_params['statuscache'] && + !empty($this->_params['statuscache']) && isset($this->_temp['statuscache'][$mailbox])) { $ptr = &$this->_temp['statuscache'][$mailbox]; -- 2.11.0