OO-527: use the variables in the context of mail template too

src/main/java/org/olat/core/util/mail/MailerWithTemplate.java

@@ -164,7 +164,7 @@ public class MailerWithTemplate {
 		if (recipientsTO != null) {
 			for (Identity recipient : recipientsTO) {
 				// populate velocity context with variables
-				VelocityContext context = new VelocityContext();
+				VelocityContext context = getContext(template);
 				template.putVariablesInMailContext(context, recipient);
 				sendWithContext(context, mCtxt, metaId, recipient, template, sender, result);
 				if (!result.getFailedIdentites().contains(recipient)) {
@@ -177,7 +177,7 @@ public class MailerWithTemplate {
 				List<Identity> cc = new ArrayList<Identity>();
 				cc.add(recipient);
 				// populate velocity context with variables
-				VelocityContext context = new VelocityContext();
+				VelocityContext context = getContext(template);
 				template.putVariablesInMailContext(context, recipient);
 				sendWithContext(context, mCtxt, metaId, recipient, template, sender, result);
 			}
@@ -191,6 +191,13 @@ public class MailerWithTemplate {
 		return result;
 	}
 	
+	private VelocityContext getContext(MailTemplate template) {
+		if(template != null && template.getContext() != null) {
+			return new VelocityContext(template.getContext());
+		}
+		return new VelocityContext();
+	}
+	
 	/**
 	 * may return null, but then the result.getReturnCode != OK... so check the
 	 * result code.