summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2015-01-15 10:56:17 +0100
committerAleksander Machniak <alec@alec.pl>2015-01-15 10:56:17 +0100
commitde0bc662f9a8739d649c3dce9b12113fd832bafd (patch)
tree9e0398eb3fa4d909a4335feb1bcc5547c8895a59 /program/js
parentb196d229c3688c317b2cc28240723aec41b5eb5e (diff)
Fix bug where search was reset after returning from compose opened by reply button(s)
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js7
1 files changed, 2 insertions, 5 deletions
diff --git a/program/js/app.js b/program/js/app.js
index 8e3f9cd5a..399e903bf 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1055,12 +1055,9 @@ function rcube_webmail()
url = {};
if (this.task == 'mail') {
- url._mbox = this.env.mailbox;
+ url = {_mbox: this.env.mailbox, _search: this.env.search_request};
if (props)
url._to = props;
- // also send search request so we can go back to search result after message is sent
- if (this.env.search_request)
- url._search = this.env.search_request;
}
// modify url if we're in addressbook
else if (this.task == 'addressbook') {
@@ -1155,7 +1152,7 @@ function rcube_webmail()
case 'reply-list':
case 'reply':
if (uid = this.get_single_uid()) {
- url = {_reply_uid: uid, _mbox: this.get_message_mailbox(uid)};
+ url = {_reply_uid: uid, _mbox: this.get_message_mailbox(uid), _search: this.env.search_request};
if (command == 'reply-all')
// do reply-list, when list is detected and popup menu wasn't used
url._all = (!props && this.env.reply_all_mode == 1 && this.commands['reply-list'] ? 'list' : 'all');