From 85f14674316387d08fa11221de340c71835c4fa3 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 28 Jul 2014 05:14:23 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/js/app.js | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index e00479f..b4e11b9 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1052,7 +1052,7 @@
if (this.task == 'mail') {
url._mbox = this.env.mailbox;
if (props)
- url._to = 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;
@@ -1080,8 +1080,12 @@
break;
}
}
- else if (props)
+ else if (props && typeof props == 'string') {
url._to = props;
+ }
+ else if (props && typeof props == 'object') {
+ $.extend(url, props);
+ }
this.open_compose_step(url);
break;
--
Gitblit v1.9.1