From 45924a1a8a3a8fdaf5a04511ece3db344d63a42f Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Thu, 10 Apr 2014 10:40:18 +0200 Subject: Foward locking parameter --- program/js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'program') diff --git a/program/js/app.js b/program/js/app.js index 7f19382e0..5fe58702d 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -6861,7 +6861,7 @@ function rcube_webmail() this.goto_url = function(action, query, lock) { - this.redirect(this.url(action, query)); + this.redirect(this.url(action, query), lock); }; this.location_href = function(url, target, frame) -- cgit v1.2.3 From 8ed382f1ec92d110ccc4dbfcabed06795acd199d Mon Sep 17 00:00:00 2001 From: Thomas Bruederli Date: Thu, 10 Apr 2014 10:42:17 +0200 Subject: Append group parameter to attachments set by plugins if not present --- program/steps/mail/compose.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'program') diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index 22ebaed8d..2b717d673 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.inc @@ -487,7 +487,7 @@ function rcmail_process_compose_params(&$COMPOSE) foreach ($plugin['attachments'] as $attach) { // we have structured data if (is_array($attach)) { - $attachment = $attach; + $attachment = $attach + array('group' => $COMPOSE_ID); } // only a file path is given else { -- cgit v1.2.3