From 41caad8b48b0b6038294d90e4fdea0ad779fe9ad Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 26 Jun 2009 08:40:58 -0400
Subject: [PATCH] - fix lost argument in iil_C_FetchHeaders call (#1485941)
---
program/include/rcube_imap.php | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php
index 556c8b0..831dff6 100644
--- a/program/include/rcube_imap.php
+++ b/program/include/rcube_imap.php
@@ -773,7 +773,7 @@
function _fetch_headers($mailbox, $msgs, &$a_msg_headers, $cache_key)
{
// fetch reqested headers from server
- $a_header_index = iil_C_FetchHeaders($this->conn, $mailbox, $msgs, false, $this->fetch_add_headers);
+ $a_header_index = iil_C_FetchHeaders($this->conn, $mailbox, $msgs, false, false, $this->fetch_add_headers);
if (!empty($a_header_index))
{
@@ -938,7 +938,7 @@
if ($headers = iil_C_FetchHeader($this->conn, $mailbox, join(',', $for_update), false, $this->fetch_add_headers))
foreach ($headers as $header)
$this->add_message_cache($cache_key, $header->id, $header, NULL,
- in_array((string)$header->uid, $for_remove, true));
+ in_array((string)$header->uid, (array)$for_remove, true));
}
}
@@ -2291,8 +2291,7 @@
{
$internal_key = '__single_msg';
- if ($this->caching_enabled && (!isset($this->cache[$internal_key][$uid]) ||
- ($struct && empty($this->cache[$internal_key][$uid]->structure))))
+ if ($this->caching_enabled && !isset($this->cache[$internal_key][$uid]))
{
$sql_result = $this->db->query(
"SELECT idx, headers, structure
@@ -3037,6 +3036,13 @@
var $d_parameters = array();
var $ctype_parameters = array();
+ function __clone()
+ {
+ if (isset($this->parts))
+ foreach ($this->parts as $idx => $part)
+ if (is_object($part))
+ $this->parts[$idx] = clone $part;
+ }
}
--
Gitblit v1.9.1