Merge OpenOLAT 10.4 to OpenOLAT default branch with 2ab9799a71574387b6abde9a7446764e9aaec191

src/main/java/org/olat/course/CourseXStreamAliases.java

@@ -24,6 +24,7 @@ import org.olat.core.gui.control.generic.iframe.DeliveryOptions;
 import org.olat.core.util.xml.XStreamHelper;
 import org.olat.course.condition.Condition;
 import org.olat.course.condition.ExtendedCondition;
+import org.olat.course.condition.operators.AttributeEndswithOperator;
 import org.olat.course.condition.operators.AttributeStartswithOperator;
 import org.olat.course.condition.operators.EqualsOperator;
 import org.olat.course.condition.operators.GreaterThanEqualsOperator;
@@ -140,6 +141,7 @@ public class CourseXStreamAliases {
 		readXstream.alias("HasAttributeOperator", HasAttributeOperator.class);
 		readXstream.alias("HasNotAttributeOperator", HasNotAttributeOperator.class);
 		readXstream.alias("AttributeStartswithOperator", AttributeStartswithOperator.class);
+		readXstream.alias("AttributeEndswithOperator", AttributeEndswithOperator.class);
 		
 		//deleted attributes
 		readXstream.omitField(DeliveryOptions.class, "noJavascript");

src/main/java/org/olat/course/area/CourseAreasController.java

@@ -24,6 +24,7 @@ import java.util.List;
 
 import org.olat.core.gui.UserRequest;
 import org.olat.core.gui.components.Component;
+import org.olat.core.gui.components.EscapeMode;
 import org.olat.core.gui.components.link.Link;
 import org.olat.core.gui.components.link.LinkFactory;
 import org.olat.core.gui.components.panel.StackedPanel;
@@ -86,7 +87,9 @@ public class CourseAreasController extends MainLayoutBasicController {
 		listenTo(tableCtrl);
 		
 		tableCtrl.addColumnDescriptor(new DefaultColumnDescriptor("table.header.name", 0, null, getLocale()));
-		tableCtrl.addColumnDescriptor(new DefaultColumnDescriptor("table.header.description", 1, null, getLocale()));
+		DefaultColumnDescriptor descriptionColDesc = new DefaultColumnDescriptor("table.header.description", 1, null, getLocale());
+		descriptionColDesc.setEscapeHtml(EscapeMode.antisamy);
+		tableCtrl.addColumnDescriptor(descriptionColDesc);
 		tableCtrl.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_EDIT, "action", translate("edit")));
 		tableCtrl.addColumnDescriptor(new StaticColumnDescriptor(TABLE_ACTION_DELETE, "action", translate("delete")));