diff --git a/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java b/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java index de911c432189951d27548959a9c87841194a9733..23bbd6bfc4cda6ac856cec8f8fc99e25a822cead 100644 --- a/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java +++ b/src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java @@ -1475,7 +1475,7 @@ public class BusinessGroupServiceImpl implements BusinessGroupService, UserDataD mailing = new MailPackage(true); } - BusinessGroupMailing.sendEmail(ureqIdentity, firstWaitingListIdentity, group, MailType.graduateFromWaitingListToParticpant, mailing); + BusinessGroupMailing.sendEmail(null, firstWaitingListIdentity, group, MailType.graduateFromWaitingListToParticpant, mailing); counter++; } } diff --git a/src/main/java/org/olat/group/ui/BGMailHelper.java b/src/main/java/org/olat/group/ui/BGMailHelper.java index e29acffcc06146506e5b41d76c0afbc8ae32bdad..c7d68019f25aa182e8d0306ee527c969cd184ad9 100644 --- a/src/main/java/org/olat/group/ui/BGMailHelper.java +++ b/src/main/java/org/olat/group/ui/BGMailHelper.java @@ -192,13 +192,18 @@ public class BGMailHelper { */ private static MailTemplate createMailTemplate(BusinessGroupShort group, Identity actor, String subjectKey, String bodyKey) { // get some data about the actor and fetch the translated subject / body via i18n module - String[] bodyArgs = new String[] { - actor.getUser().getProperty(UserConstants.FIRSTNAME, null), - actor.getUser().getProperty(UserConstants.LASTNAME, null), - actor.getUser().getProperty(UserConstants.EMAIL, null), - actor.getUser().getProperty(UserConstants.EMAIL, null)// 2x for compatibility with old i18m properties - }; - Locale locale = I18nManager.getInstance().getLocaleOrDefault(actor.getUser().getPreferences().getLanguage()); + String[] bodyArgs = null; + String lang = null; + if (actor != null) { + bodyArgs = new String[] { + actor.getUser().getProperty(UserConstants.FIRSTNAME, null), + actor.getUser().getProperty(UserConstants.LASTNAME, null), + actor.getUser().getProperty(UserConstants.EMAIL, null), + actor.getUser().getProperty(UserConstants.EMAIL, null)// 2x for compatibility with old i18m properties + }; + lang = actor.getUser().getPreferences().getLanguage(); + } + Locale locale = I18nManager.getInstance().getLocaleOrDefault(lang); Translator trans = Util.createPackageTranslator(BGMailHelper.class, locale, Util.createPackageTranslator(BusinessGroupListController.class, locale)); String subject = trans.translate(subjectKey);