inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
92323: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      92224: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.1)
         92166: MNT-12534: Javascript Mail action does not handle the subjectParams parameter
         Added a check for null parameters. 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94868 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 11:47:27 +00:00
parent 34c8dba387
commit 0bc48ce882
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/java/org/alfresco/repo/action/executer/MailActionExecuter.java
View File

@@ -885,6 +885,7 @@ public class MailActionExecuter extends ActionExecuterAbstractBase
// set subject line // set subject line
String subject = (String)ruleAction.getParameterValue(PARAM_SUBJECT); String subject = (String)ruleAction.getParameterValue(PARAM_SUBJECT);
List<Object> subjectParams = (List<Object>)ruleAction.getParameterValue(PARAM_SUBJECT_PARAMS); List<Object> subjectParams = (List<Object>)ruleAction.getParameterValue(PARAM_SUBJECT_PARAMS);
subjectParams = subjectParams == null ? new ArrayList<Object>() : subjectParams;
String localizedSubject = getLocalizedSubject(subject, subjectParams.toArray(), locale); String localizedSubject = getLocalizedSubject(subject, subjectParams.toArray(), locale);
if (locale == null) if (locale == null)
{ {