Skip to content

Commit 29f2cd1

Browse files
committed
Merge branch 'pu/ccheng/encryped_email_js_error' into '2022.11'
fix(Felamimail/js): parse recipient as string in encryped email See merge request tine20/tine20!5210
2 parents d35ddf0 + 7f29602 commit 29f2cd1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

tine20/Felamimail/js/MessageEditDialog.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1968,9 +1968,10 @@ Tine.Felamimail.MessageEditDialog = Ext.extend(Tine.widgets.dialog.EditDialog, {
19681968
if (me.button_toggleEncrypt.pressed && me.mailvelopeEditor) {
19691969
// always add own address so send message can be decrypted
19701970
all.push(me.record.get('from_email'));
1971-
1971+
19721972
all = all.map(function (item) {
1973-
return addressparser.parse(item.replace(/,/g, '\\\\,'))[0].address;
1973+
const email = item.email ?? item;
1974+
return addressparser.parse(email.replace(/,/g, '\\\\,'))[0].address;
19741975
});
19751976

19761977
return Tine.Felamimail.mailvelopeHelper.getKeyring().then(function (keyring) {

0 commit comments

Comments
 (0)