Index: lams_admin/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.13 -r1.14
--- lams_admin/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:43 -0000	1.13
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:54:32 -0000	1.14
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_central/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_central/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:53 -0000	1.14
+++ lams_central/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:55:11 -0000	1.15
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_gradebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.13 -r1.14
--- lams_gradebook/web/WEB-INF/tags/CKEditor.tag	3 Sep 2013 10:56:06 -0000	1.13
+++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:56:02 -0000	1.14
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_learning/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.13 -r1.14
--- lams_learning/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:36 -0000	1.13
+++ lams_learning/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:56:29 -0000	1.14
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_monitoring/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.13 -r1.14
--- lams_monitoring/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:41 -0000	1.13
+++ lams_monitoring/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:56:57 -0000	1.14
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.13 -r1.14
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:57 -0000	1.13
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:51:09 -0000	1.14
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_assessment/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/summary.jsp,v
diff -u -r1.21 -r1.22
--- lams_tool_assessment/web/pages/monitoring/summary.jsp	31 Mar 2014 17:25:24 -0000	1.21
+++ lams_tool_assessment/web/pages/monitoring/summary.jsp	1 Apr 2014 16:51:09 -0000	1.22
@@ -192,10 +192,12 @@
 
 <script type="text/javascript" src="<lams:LAMSURL/>/includes/javascript/monitorToolSummaryAdvanced.js" ></script>
 
+<h1><c:out value="${assessment.title}" escapeXml="true"/></h1>
 
-<%@ include file="parts/advanceoptions.jsp"%>
+<div class="instructions space-top">
+	<c:out value="${assessment.instructions}" escapeXml="false"/>
+</div>
 
-<%@ include file="parts/dateRestriction.jsp"%>
 
 <c:choose>
 	<c:when test="${empty summaryList}">
@@ -263,3 +265,9 @@
 	
 	</c:otherwise>
 </c:choose>
+
+<br/>
+
+<%@ include file="parts/advanceoptions.jsp"%>
+
+<%@ include file="parts/dateRestriction.jsp"%>
Index: lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	7 Aug 2013 07:29:12 -0000	1.6
+++ lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp	1 Apr 2014 16:51:09 -0000	1.7
@@ -1,16 +1,20 @@
 <%@ include file="/common/taglibs.jsp"%>
+
 <script type="text/javascript">
 	<!--
 	function masterDetailLoadUp(){
 			jQuery("#userSummary${assessmentResult.sessionId}").clearGridData().setGridParam({scrollOffset: 18});
  	        <c:forEach var="questionResult" items="${assessmentResult.questionResults}" varStatus="i">
 	       		<c:set var="question" value="${questionResult.assessmentQuestion}"/>
+	       		<c:set var="title">
+	       			<c:out value="${questionResult.assessmentQuestion.titleEscaped}" escapeXml="true"/>
+	       		</c:set>	
  	        	var responseStr = "";
  	       		<%@ include file="userresponse.jsp"%>
  	     		jQuery("#userSummary${assessmentResult.sessionId}").addRowData(${i.index + 1}, {
  	   	     		id:"${i.index + 1}",
  	   	   			questionResultUid:"${questionResult.uid}",
- 	   	   			title:"${questionResult.assessmentQuestion.titleEscaped}",
+ 	   	   			title:"${title}",
  	   	   			response:responseStr,
  	   	   			grade:"<fmt:formatNumber value='${questionResult.mark}' maxFractionDigits='3'/>"
  	   	   	    });	
Index: lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:27 -0000	1.4
+++ lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:57:46 -0000	1.5
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.13 -r1.14
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:50 -0000	1.13
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:58:15 -0000	1.14
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.13 -r1.14
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:19:07 -0000	1.13
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:58:52 -0000	1.14
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:52 -0000	1.4
+++ lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:59:37 -0000	1.5
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.13 -r1.14
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:37 -0000	1.13
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:59:59 -0000	1.14
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.13 -r1.14
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:46 -0000	1.13
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:00:19 -0000	1.14
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.13 -r1.14
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:23 -0000	1.13
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:00:37 -0000	1.14
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
Index: lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.4 -r1.5
--- lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:24 -0000	1.4
+++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:00:57 -0000	1.5
@@ -1,5 +1,6 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
 
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="value" required="true" rtexprvalue="true"%>
@@ -29,8 +30,10 @@
 <c:if test="${empty height}">
 	<c:set var="height" value="100px" />
 </c:if>
+<c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
+<c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${value}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
 	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>