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
This commit is contained in:
Alan Davis
2015-01-31 09:47:33 +00:00
parent ed947e5a98
commit a4cc7dac9c

View File

@@ -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)
{