Index: lams_tool_gmap/web/common/learnerheader.jsp
===================================================================
diff -u -r246391daeb0df3804fc523b4b635ebf5b0b222d0 -rd9fea0d214dfaae43a89801f03bd4cc7d617fffa
--- lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision 246391daeb0df3804fc523b4b635ebf5b0b222d0)
+++ lams_tool_gmap/web/common/learnerheader.jsp	(.../learnerheader.jsp)	(revision d9fea0d214dfaae43a89801f03bd4cc7d617fffa)
@@ -73,7 +73,7 @@
 				map.setCenter(new GLatLng('${gmapDTO.mapCenterLatitude}', '${gmapDTO.mapCenterLongitude}' ));
 				map.setZoom(${gmapDTO.mapZoom});
 
-				currUser = '${gmapUserDTO.firstName} ${gmapUserDTO.lastName}';
+				currUser = '<c:out value="${gmapUserDTO.firstName} ${gmapUserDTO.lastName}" escapeXml="true"/>';
 				currUserId = '${gmapUserDTO.uid}'
 				
 				// Set up map controls
@@ -88,22 +88,22 @@
 		    	
 		    	addUserToList('0',"<fmt:message key="label.authoring.basic.authored"></fmt:message>" );
 		    	<c:forEach var="user" items="${gmapSessionDTO.userDTOs}">
-		    		addUserToList('${user.uid}','${user.firstName} ${user.lastName}');
+		    		addUserToList('${user.uid}','<c:out value="${user.firstName} ${user.lastName}" escapeXml="true"/>');
 		    	</c:forEach>
 		    	
 		    	<c:forEach var="marker" items="${gmapSessionDTO.markerDTOs}">
 					<c:choose>
 					<c:when test="${marker.createdBy.loginName == gmapUserDTO.loginName && marker.isAuthored == false}">
-					    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}');	
+					    addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), '${marker.uid}', true, ${gmapDTO.allowEditMarkers}, '<c:out value="${marker.createdBy.firstName} ${marker.createdBy.lastName}" escapeXml="true"/>', '${marker.createdBy.uid}');	
 						userMarkerCount ++;
 					</c:when>
 					<c:otherwise>
 						<c:choose>
 						<c:when  test="${marker.isAuthored}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, "<fmt:message key="label.authoring.basic.authored"></fmt:message>", '0' );
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true" />'), '${marker.uid}', true, false, "<fmt:message key="label.authoring.basic.authored"></fmt:message>", '0' );
 						</c:when>
 						<c:when  test="${gmapDTO.allowShowAllMarkers}">
-						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}"/>'), decode_utf8('<c:out value="${marker.title}" />'), '${marker.uid}', true, false, '${marker.createdBy.firstName} ${marker.createdBy.lastName}', '${marker.createdBy.uid}' );
+						addMarker(new GLatLng('${marker.latitude}', '${marker.longitude}' ), decode_utf8('<c:out value="${marker.infoWindowMessage}" escapeXml="true"/>'), decode_utf8('<c:out value="${marker.title}" escapeXml="true"/>'), '${marker.uid}', true, false, '<c:out value="${marker.createdBy.firstName} ${marker.createdBy.lastName}" escapeXml="true"/>', '${marker.createdBy.uid}' );
 						</c:when>
 						</c:choose>
 					</c:otherwise>