Skip to content
Snippets Groups Projects
Commit 993819c9 authored by srosse's avatar srosse
Browse files

OO-4876: escape line breaks of the meeting description

parent 6eabd4f9
No related branches found
No related tags found
No related merge requests found
......@@ -122,8 +122,12 @@ public class BigBlueButtonGuestJoinController extends FormBasicController implem
&& !Boolean.TRUE.equals(ureq.getUserSession().getEntry("meeting-" + meeting.getKey()))) {
FormLayoutContainer layoutCont = (FormLayoutContainer)formLayout;
layoutCont.contextPut("title", meeting.getName());
if(StringHelper.containsNonWhitespace(meeting.getDescription())) {
layoutCont.contextPut("description", meeting.getDescription());
String descr = meeting.getDescription();
if(StringHelper.containsNonWhitespace(descr)) {
if(!StringHelper.isHtml(descr)) {
descr = Formatter.escWithBR(descr).toString();
}
layoutCont.contextPut("description", descr);
}
if(meeting.getStartDate() != null) {
String start = Formatter.getInstance(getLocale()).formatDateAndTime(meeting.getStartDate());
......
......@@ -141,8 +141,12 @@ public class BigBlueButtonMeetingController extends FormBasicController implemen
if(formLayout instanceof FormLayoutContainer) {
FormLayoutContainer layoutCont = (FormLayoutContainer)formLayout;
layoutCont.contextPut("title", meeting.getName());
if(StringHelper.containsNonWhitespace(meeting.getDescription())) {
layoutCont.contextPut("description", meeting.getDescription());
String descr = meeting.getDescription();
if(StringHelper.containsNonWhitespace(descr)) {
if(!StringHelper.isHtml(descr)) {
descr = Formatter.escWithBR(descr).toString();
}
layoutCont.contextPut("description", descr);
}
if(meeting.getStartDate() != null) {
String start = Formatter.getInstance(getLocale()).formatDateAndTime(meeting.getStartDate());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment