Merge OpenOLAT 12.1 to OpenOLAT default branch with 2444238217db3f0013c8c5240dc97d4b0e25424e

src/main/java/org/olat/user/UserInfoMainController.java

@@ -333,7 +333,7 @@ public class UserInfoMainController extends MainLayoutBasicController implements
 		}
 		
 		calendarWrapper.setPrivateEventsVisible(chosenIdentity.equals(ureq.getIdentity()));
-		if (ureq.getUserSession().getRoles().isOLATAdmin() || chosenIdentity.equals(ureq.getIdentity())) {
+		if (chosenIdentity.equals(ureq.getIdentity())) {
 			calendarWrapper.setAccess(KalendarRenderWrapper.ACCESS_READ_WRITE);
 		} else {
 			calendarWrapper.setAccess(KalendarRenderWrapper.ACCESS_READ_ONLY);
@@ -355,8 +355,7 @@ public class UserInfoMainController extends MainLayoutBasicController implements
 		String chosenUserFolderRelPath = FolderConfig.getUserHome(chosenIdentity.getName()) + "/public";
 
 		OlatRootFolderImpl rootFolder = new OlatRootFolderImpl(chosenUserFolderRelPath, null);
-		String rootFolderName = StringHelper.escapeHtml(firstLastName);
-		OlatNamedContainerImpl namedFolder = new OlatNamedContainerImpl(rootFolderName, rootFolder);
+		OlatNamedContainerImpl namedFolder = new OlatNamedContainerImpl(firstLastName, rootFolder);
 		
 		//decided in plenum to have read only view in the personal visiting card, even for admin
 		VFSSecurityCallback secCallback = new ReadOnlyCallback();