From 434d2019f6b869e891bbf0571a11323d7faf6153 Mon Sep 17 00:00:00 2001 From: Mark Rogers Date: Wed, 30 Apr 2014 16:05:23 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 67759: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud) 67066: Merged DEV to V4.2-BUG-FIX (4.2.3) 66967 : MNT-11056 : Outbound mail fails if using notify user template - Put person nodeRef to model if user is admin git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@68394 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/action/executer/MailActionExecuter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java index 46ccdee71d..be7ad45c9a 100644 --- a/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java +++ b/source/java/org/alfresco/repo/action/executer/MailActionExecuter.java @@ -703,8 +703,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase final String currentUserName = authService.getCurrentUserName(); - final List usersNotToBeUsedInFromField = Arrays.asList(new String[] {AuthenticationUtil.getAdminUserName(), - AuthenticationUtil.getSystemUserName(), + final List usersNotToBeUsedInFromField = Arrays.asList(new String[] {AuthenticationUtil.getSystemUserName(), AuthenticationUtil.getGuestUserName()}); if ( !usersNotToBeUsedInFromField.contains(currentUserName)) {