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
This commit is contained in:
Mark Rogers
2014-04-30 16:05:23 +00:00
parent 70aeb2fa4a
commit 434d2019f6

View File

@@ -703,8 +703,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
final String currentUserName = authService.getCurrentUserName(); final String currentUserName = authService.getCurrentUserName();
final List<String> usersNotToBeUsedInFromField = Arrays.asList(new String[] {AuthenticationUtil.getAdminUserName(), final List<String> usersNotToBeUsedInFromField = Arrays.asList(new String[] {AuthenticationUtil.getSystemUserName(),
AuthenticationUtil.getSystemUserName(),
AuthenticationUtil.getGuestUserName()}); AuthenticationUtil.getGuestUserName()});
if ( !usersNotToBeUsedInFromField.contains(currentUserName)) if ( !usersNotToBeUsedInFromField.contains(currentUserName))
{ {