Index: lams_admin/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_admin/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_central/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_central/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_gradebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_gradebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_learning/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_learning/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_learning/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_monitoring/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_monitoring/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_monitoring/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_images/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 17ddd3aac11d9fecc83159a9c829e989754accfb)
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -106,7 +106,7 @@
 			doAjaxCall(clearSessionUrl);
 		} else {
 			if ('${param.noopener}' == 'true' || notifyCloseURL.indexOf('noopener=true') >= 0) {
-				window.location.href = notifyCloseURL;
+				window.location.href = notifyCloseURL + '&action=' + nextAction;
 			} else if (window.parent.opener == null){
 				doAjaxCall(notifyCloseURL);
 			} else {
@@ -130,4 +130,4 @@
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 </p>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_leader/web/WEB-INF/tags/TabName.tag
===================================================================
diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_leader/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision 17ddd3aac11d9fecc83159a9c829e989754accfb)
+++ lams_tool_leader/web/WEB-INF/tags/TabName.tag	(.../TabName.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -56,4 +56,4 @@
 
 <a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_leader/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 17ddd3aac11d9fecc83159a9c829e989754accfb)
+++ lams_tool_leader/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -133,4 +133,4 @@
 	</lams:ImgButtonWrapper>
 	</form>
 </c:if>
-<!-- end text search form content -->
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_nb/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r15c0a003cf5e1a8a8d223d76a3af911b336fc940 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 15c0a003cf5e1a8a8d223d76a3af911b336fc940)
+++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_survey/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_task/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_vote/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 3d7bcdb3b84b2fda69b51b5b3c6d8aebd3fbe394)
+++ lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -62,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Index: lams_www/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r2fefeced8f1c59d64588533ff200dbb4f1f16d42 -rdc884b8e6274ebbc664d1ee940e565803445bb26
--- lams_www/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fefeced8f1c59d64588533ff200dbb4f1f16d42)
+++ lams_www/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision dc884b8e6274ebbc664d1ee940e565803445bb26)
@@ -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>
@@ -59,6 +62,7 @@
 		var instance = CKEDITOR.replace( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
+				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",