Merge OpenOLAT 11.0 to OpenOLAT default branch with a3c5c1aaa16bd8b7964e094a2410004cbe1f4022

src/main/java/org/olat/core/gui/control/generic/wizard/StepsMainRunController.java

@@ -176,7 +176,7 @@ public class StepsMainRunController extends FormBasicController implements Gener
 	 */
 	@Override
 	protected void doDispose() {
-		//
+		getWindowControl().getWindowBackOffice().removeCycleListener(this);
 	}
 
 	/*

src/main/java/org/olat/core/gui/control/winmgr/WindowBackOfficeImpl.java

@@ -91,9 +91,9 @@ public class WindowBackOfficeImpl implements WindowBackOffice {
 	private GuiDebugDispatcherController guidebugC;
 	private InlineTranslationInterceptHandlerController inlineTranslationC;
 	
-	private List<ZIndexWrapper> guiMessages = new ArrayList<ZIndexWrapper>(); // request-transient render-related data
+	private List<ZIndexWrapper> guiMessages = new ArrayList<>(); // request-transient render-related data
 	
-	private transient List<GenericEventListener> cycleListeners = new CopyOnWriteArrayList<GenericEventListener>();
+	private transient List<GenericEventListener> cycleListeners = new CopyOnWriteArrayList<>();
 	
 	WindowBackOfficeImpl(final WindowManagerImpl winmgrImpl, String windowName, ChiefController windowOwner, WindowSettings settings) {
 		this.winmgrImpl = winmgrImpl;
@@ -177,6 +177,7 @@ public class WindowBackOfficeImpl implements WindowBackOffice {
 	/**
 	 * @see org.olat.core.gui.control.WindowBackOffice#sendCommandTo(org.olat.core.gui.control.winmgr.Command)
 	 */
+	@Override
 	public void sendCommandTo(Command wco) {
 		if (ajaxC != null) ajaxC.sendCommandTo(new WindowCommand(this,wco));
 	}
@@ -237,6 +238,7 @@ public class WindowBackOfficeImpl implements WindowBackOffice {
 	 * @param windowControl
 	 * @return
 	 */
+	@Override
 	public Controller createInlineTranslationDispatcherController(UserRequest ureq, WindowControl windowControl) {
 		if (inlineTranslationC != null) throw new AssertException("Can't set the inline translation dispatcher twice!", null);
 		inlineTranslationC = I18nUIFactory.createInlineTranslationIntercepHandlerController(ureq, windowControl);
@@ -244,6 +246,7 @@ public class WindowBackOfficeImpl implements WindowBackOffice {
 		return inlineTranslationC;
 	}
 
+	@Override
 	public Controller createAJAXController(UserRequest ureq) {
 		boolean ajaxEnabled = winmgrImpl.isAjaxEnabled();
 		ajaxC = new AjaxController(ureq, this, ajaxEnabled);
@@ -253,6 +256,7 @@ public class WindowBackOfficeImpl implements WindowBackOffice {
 	/* (non-Javadoc)
 	 * @see org.olat.core.gui.control.WindowBackOffice#isDebuging()
 	 */
+	@Override
 	public boolean isDebuging() {
 		return Settings.isDebuging();
 	}
@@ -313,7 +317,6 @@ public class WindowBackOfficeImpl implements WindowBackOffice {
 			// clear the added data for this cycle
 			guiMessages.clear();
 		}
-		
 	}
 
 	@Override

src/main/java/org/olat/ims/qti/container/qtielements/Response_label.java

@@ -118,7 +118,7 @@ public class Response_label extends GenericQTIElement {
 				appendParameterIdent(buffer, ri);
 				buffer.append("\" type=\"text\" size=\"").append(columns).append("\" maxlength=\"").append(maxlength);
 				if (iinput != null && !iinput.isEmpty() && iinput.getSingle(responseIdent) != null) {
-					buffer.append("\" value=\"").append(iinput.getSingle(getQTIIdent())); //TODO: LD: must this value be escapeHtml?					
+					buffer.append("\" value=\"").append(StringHelper.escapeHtml(iinput.getSingle(getQTIIdent())));
 				}
 				buffer.append("\" onchange=\"return setFormDirty('ofo_iq_item')\" onclick=\"return setFormDirty('ofo_iq_item')\" /><span> </span>");
 			}

src/main/java/org/olat/instantMessaging/ui/InstantMessagingMainController.java

@@ -169,6 +169,7 @@ public class InstantMessagingMainController extends BasicController implements G
 		imService.unlistenChat(getIdentity(), getPrivatListenToResourceable(), this);
 		singleUserEventCenter.deregisterFor(this, InstantMessagingService.ASSESSMENT_EVENT_ORES);
 		singleUserEventCenter.deregisterFor(this, InstantMessagingService.TOWER_EVENT_ORES);
+		getWindowControl().getWindowBackOffice().removeCycleListener(this);
 	}
 	
 	public OLATResourceable getPrivatListenToResourceable() {

src/main/java/org/olat/repository/handlers/WikiHandler.java

@@ -214,7 +214,7 @@ public class WikiHandler implements RepositoryHandler {
 					} else {
 						controller = new WikiMainController(uureq, wwControl, entry.getOlatResource(), callback, null);
 					}
-					return new OLATResourceableListeningWrapperController(ureq, wControl, entry.getOlatResource(), controller, null, ureq.getIdentity());
+					return new OLATResourceableListeningWrapperController(uureq, wwControl, entry.getOlatResource(), controller, null, uureq.getIdentity());
 				}
 			});