From a57f9e2c64a8495ccb89a8b79eba6052483a0ede Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 23 Apr 2012 05:33:35 -0400
Subject: [PATCH] - Applied fixes from trunk up to r6118
---
program/include/rcube_result_index.php | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/program/include/rcube_result_index.php b/program/include/rcube_result_index.php
index 1c7a5e0..cd90067 100644
--- a/program/include/rcube_result_index.php
+++ b/program/include/rcube_result_index.php
@@ -89,18 +89,18 @@
$param = strtoupper($m[1]);
$value = $m[2];
- $this->params[strtoupper($m[1])] = $value;
+ $this->params[$param] = $value;
$data_item = substr($data_item, strlen($m[0]));
if (in_array($param, array('COUNT', 'MIN', 'MAX'))) {
- $this->meta[strtolower($param)] = (int) $m[2];
+ $this->meta[strtolower($param)] = (int) $value;
}
}
// @TODO: Implement compression using compressMessageSet() in __sleep() and __wakeup() ?
// @TODO: work with compressed result?!
if (isset($this->params['ALL'])) {
- $data[$idx] = implode(self::SEPARATOR_ELEMENT,
+ $data_item = implode(self::SEPARATOR_ELEMENT,
rcube_imap_generic::uncompressMessageSet($this->params['ALL']));
}
}
@@ -111,6 +111,8 @@
unset($data[$i]);
}
+ $data = array_filter($data);
+
if (empty($data)) {
return;
}
--
Gitblit v1.9.1