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.14 -r1.15
--- lams_admin/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:54:32 -0000	1.14
+++ lams_admin/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:27 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.15 -r1.16
--- lams_central/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:55:11 -0000	1.15
+++ lams_central/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:16 -0000	1.16
@@ -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/includes/javascript/ckconfig_custom.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/ckconfig_custom.js,v
diff -u -r1.22 -r1.23
--- lams_central/web/includes/javascript/ckconfig_custom.js	23 Aug 2014 01:40:49 -0000	1.22
+++ lams_central/web/includes/javascript/ckconfig_custom.js	25 Aug 2014 18:58:16 -0000	1.23
@@ -70,7 +70,6 @@
 CKEDITOR.config.removePlugins = 'elementspath';
 CKEDITOR.config.allowedContent = true;
 CKEDITOR.config.toolbarCanCollapse = true;
-CKEDITOR.config.autoGrow_minHeight = 100;
 
 // ---- Additional scripts -----
 // Hides editor instaces until they are fully initialized
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.14 -r1.15
--- lams_gradebook/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:56:02 -0000	1.14
+++ lams_gradebook/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:30 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_learning/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:56:29 -0000	1.14
+++ lams_learning/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:47 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_monitoring/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:56:57 -0000	1.14
+++ lams_monitoring/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:53 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:51:09 -0000	1.14
+++ lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:23 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.5 -r1.6
--- lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:57:46 -0000	1.5
+++ lams_tool_bbb/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:43 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:58:15 -0000	1.14
+++ lams_tool_chat/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:18 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:58:52 -0000	1.14
+++ lams_tool_daco/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:40 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.5 -r1.6
--- lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:59:37 -0000	1.5
+++ lams_tool_eadventure/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:14 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 16:59:59 -0000	1.14
+++ lams_tool_forum/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:21 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:00:19 -0000	1.14
+++ lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:48 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_images/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:00:37 -0000	1.14
+++ lams_tool_images/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:10 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.5 -r1.6
--- lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:00:57 -0000	1.5
+++ lams_tool_imscc/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:45 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:01:15 -0000	1.3
+++ lams_tool_kaltura/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:39 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:01:40 -0000	1.14
+++ lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:29 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:02:58 -0000	1.14
+++ lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:15 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:03:21 -0000	1.14
+++ lams_tool_larsrc/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:41 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	8 Jan 2014 20:13:50 -0000	1.1
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	25 Aug 2014 18:58:50 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.2 -r1.3
--- lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:03:54 -0000	1.2
+++ lams_tool_leader/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:50 -0000	1.3
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/TabName.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/WEB-INF/tags/TabName.tag	8 Jan 2014 20:13:50 -0000	1.1
+++ lams_tool_leader/web/WEB-INF/tags/TabName.tag	25 Aug 2014 18:58:50 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/TextSearch.tag,v
diff -u -r1.1 -r1.2
--- lams_tool_leader/web/WEB-INF/tags/TextSearch.tag	8 Jan 2014 20:13:50 -0000	1.1
+++ lams_tool_leader/web/WEB-INF/tags/TextSearch.tag	25 Aug 2014 18:58:50 -0000	1.2
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:04:18 -0000	1.14
+++ lams_tool_mindmap/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:24 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 15:46:27 -0000	1.14
+++ lams_tool_nb/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:34 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.15 -r1.16
--- lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:05:08 -0000	1.15
+++ lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:13 -0000	1.16
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:05:38 -0000	1.14
+++ lams_tool_pixlr/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:12 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:05:58 -0000	1.14
+++ lams_tool_sbmt/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:31 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.3 -r1.4
--- lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:06:23 -0000	1.3
+++ lams_tool_scratchie/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:19 -0000	1.4
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:06:49 -0000	1.14
+++ lams_tool_scribe/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:36 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:07:13 -0000	1.14
+++ lams_tool_spreadsheet/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:32 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:07:32 -0000	1.14
+++ lams_tool_survey/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:42 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_task/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_task/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:07:57 -0000	1.14
+++ lams_tool_task/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:25 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:08:18 -0000	1.14
+++ lams_tool_videorecorder/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:51 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:08:36 -0000	1.14
+++ lams_tool_vote/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:20 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.14 -r1.15
--- lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:08:59 -0000	1.14
+++ lams_tool_wiki/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:26 -0000	1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.5 -r1.6
--- lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag	1 Apr 2014 17:09:22 -0000	1.5
+++ lams_tool_wookie/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:28 -0000	1.6
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_www/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.2 -r1.3
--- lams_www/web/WEB-INF/tags/CKEditor.tag	3 Dec 2012 14:18:49 -0000	1.2
+++ lams_www/web/WEB-INF/tags/CKEditor.tag	25 Aug 2014 18:58:11 -0000	1.3
@@ -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",