From a4cc7dac9c42b30b794192e48f63a948a0d93a70 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Sat, 31 Jan 2015 09:47:33 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.0/Cloud) 87703: Merged V4.2-BUG-FIX (4.2.4) to HEAD-BUG-FIX (5.0/Cloud) 86519: Merged DEV to V4.2-BUG-FIX (4.2.4). 86173: MNT-12417: Send mail action in Alfresco Explorer is using neither the default from adress nor the currently logged in user's adress git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94542 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/web/bean/actions/handlers/MailHandler.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source/java/org/alfresco/web/bean/actions/handlers/MailHandler.java b/source/java/org/alfresco/web/bean/actions/handlers/MailHandler.java index 25386ce25e..0046c37b4e 100644 --- a/source/java/org/alfresco/web/bean/actions/handlers/MailHandler.java +++ b/source/java/org/alfresco/web/bean/actions/handlers/MailHandler.java @@ -78,10 +78,6 @@ public class MailHandler extends BaseActionHandler // add the subject for the email repoProps.put(MailActionExecuter.PARAM_SUBJECT, actionProps.get(PROP_SUBJECT)); - // add the from address - String from = Application.getClientConfig(FacesContext.getCurrentInstance()).getFromEmailAddress(); - repoProps.put(MailActionExecuter.PARAM_FROM, from); - // add the template if one was selected by the user if (wizard.getUsingTemplate() != null) {