From 15dc81d8f8e2d46bc57fdc79a9c28b7048b8735d Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Fri, 3 Aug 2018 11:00:21 -0600
Subject: [PATCH] Fix some bugs in mail.setContent()

---
 mail/js/app.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mail/js/app.js b/mail/js/app.js
index 1d0caf131c..eaf9653e7f 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -721,11 +721,11 @@ app.classes.mail = AppJS.extend(
 
 				// Merge array values, replace strings
 				var value = widget.getValue() || content[field];
-				if(jQuery.isArray(value))
+				if(jQuery.isArray(value) || jQuery.isArray(content[field]))
 				{
 					if(jQuery.isArray(content[field]))
 					{
-						value.concat(content[field]);
+						value = value.concat(content[field]);
 					}
 					else
 					{
@@ -740,7 +740,7 @@ app.classes.mail = AppJS.extend(
 			}
 			catch(e)
 			{
-				egw.log("error", "Unable to set field %s to '%s' in window '%s'", field, content[field],window_name);
+				egw.debug("error", "Unable to set field %s to '%s' in window '%s'", field, content[field],window.name);
 				success = false;
 				continue;
 			}