From bdb13a51f735623146f1ac81d9323e5182f99511 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 28 Jun 2010 13:36:26 -0400
Subject: [PATCH] - Fix RC forgets search results (#1483883)
---
CHANGELOG | 2 ++
program/steps/mail/search.inc | 2 +-
program/js/app.js | 4 ++--
program/steps/addressbook/search.inc | 2 +-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/CHANGELOG b/CHANGELOG
index 9859d34..c6e9351 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
CHANGELOG RoundCube Webmail
===========================
+- Fix RC forgets search results (#1483883)
+- TinyMCE 3.3.7
- Improve parsing of styled empty tags in HTML messages (#1486812)
- Add %dc variable support in base_dn/bind_dn config (#1486779)
- Add button to hide/unhide the preview pane (#1484215)
diff --git a/program/js/app.js b/program/js/app.js
index d0b3bd0..4c0e184 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -487,7 +487,7 @@
// misc list commands
case 'list':
if (this.task=='mail') {
- if (this.env.search_request<0 || (props != '' && (this.env.search_request && props != this.env.mailbox)))
+ if (!this.env.search_request || (props && props != this.env.mailbox))
this.reset_qsearch();
this.list_mailbox(props);
@@ -496,7 +496,7 @@
this.set_alttext('delete', this.env.mailbox != this.env.trash_mailbox ? 'movemessagetotrash' : 'deletemessage');
}
else if (this.task=='addressbook') {
- if (this.env.search_request<0 || (this.env.search_request && props != this.env.source))
+ if (!this.env.search_request || (props != this.env.source))
this.reset_qsearch();
this.list_contacts(props);
diff --git a/program/steps/addressbook/search.inc b/program/steps/addressbook/search.inc
index e5ace24..d23bf5d 100644
--- a/program/steps/addressbook/search.inc
+++ b/program/steps/addressbook/search.inc
@@ -39,7 +39,7 @@
else
{
$OUTPUT->show_message('nocontactsfound', 'warning');
- $search_request = -1;
+ $search_request = null;
}
// update message count display
diff --git a/program/steps/mail/search.inc b/program/steps/mail/search.inc
index e512e79..1fc74df 100644
--- a/program/steps/mail/search.inc
+++ b/program/steps/mail/search.inc
@@ -128,7 +128,7 @@
}
// update message count display
-$OUTPUT->set_env('search_request', $search_str ? $search_request : -1);
+$OUTPUT->set_env('search_request', $search_str ? $search_request : '');
$OUTPUT->set_env('messagecount', $count);
$OUTPUT->set_env('pagecount', ceil($count/$IMAP->page_size));
$OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($count, 1));
--
Gitblit v1.9.1