Index: /FCKeditor/branches/versions/2.6.x/_whatsnew.html
===================================================================
--- /FCKeditor/branches/versions/2.6.x/_whatsnew.html	(revision 7586)
+++ /FCKeditor/branches/versions/2.6.x/_whatsnew.html	(revision 7587)
@@ -34,9 +34,9 @@
 		FCKeditor ChangeLog - What's New?</h1>
 	<h3>
-		Version 2.6.7</h3>
+		Version 2.6.8</h3>
 	<p>
 		Fixed Bugs:</p>
 	<ul>
-		<li><strong>Security release, upgrade is highly recommended </strong>(improved protection for IIS6 web server).</li>
+		<li><strong>Security release, upgrade is highly recommended </strong>(fixed XSS issue).</li>
 	</ul>
 	<p>
Index: /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html
===================================================================
--- /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html	(revision 7586)
+++ /FCKeditor/branches/versions/2.6.x/_whatsnew_history.html	(revision 7587)
@@ -33,4 +33,11 @@
 	<h1>
 		FCKeditor ChangeLog - What's New?</h1>
+	<h3>
+		Version 2.6.7</h3>
+	<p>
+		Fixed Bugs:</p>
+	<ul>
+		<li><strong>Security release, upgrade is highly recommended </strong>(improved protection for IIS6 web server).</li>
+	</ul>
 	<h3>
 		Version 2.6.6</h3>
Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm
===================================================================
--- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm	(revision 7586)
+++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.cfm	(revision 7587)
@@ -66,5 +66,5 @@
 <cfset i = 0>
 <cfloop list="#submitted_text#" index="textinput">
-  <cfset texts.textinputs = ListAppend(texts.textinputs, 'textinputs[#i#] = decodeURIComponent("#textinput#");', CRLF)>
+  <cfset texts.textinputs = ListAppend(texts.textinputs, 'textinputs[#i#] = decodeURIComponent("' & htmleditformat( textinput ) & '");', CRLF)>
   <cfset i = i + 1>
 </cfloop>
Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php
===================================================================
--- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php	(revision 7586)
+++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.php	(revision 7587)
@@ -25,5 +25,5 @@
 	foreach( $textinputs as $key=>$val ) {
 		# $val = str_replace( "'", "%27", $val );
-		echo "textinputs[$key] = decodeURIComponent(\"" . $val . "\");\n";
+		echo "textinputs[$key] = decodeURIComponent(\"" . htmlspecialchars($val, ENT_QUOTES) . "\");\n";
 	}
 }
Index: /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl
===================================================================
--- /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl	(revision 7586)
+++ /FCKeditor/branches/versions/2.6.x/editor/dialog/fck_spellerpages/spellerpages/server-scripts/spellchecker.pl	(revision 7587)
@@ -19,5 +19,5 @@
 sub printTextVar {
 	for( my $i = 0; $i <= $#textinputs; $i++ ) {
-	        print "textinputs[$i] = decodeURIComponent('" . escapeQuote( $textinputs[$i] ) . "')\n";
+	        print "textinputs[$i] = decodeURIComponent(\"" . specialchar_cnv( $textinputs[$i] ) . "\");\n";
 	}
 }
@@ -107,4 +107,16 @@
 }
 
+sub specialchar_cnv
+{
+	local($ch) = @_;
+
+	$ch =~ s/&/&amp;/g;		# &
+	$ch =~ s/\"/&quot;/g;	#"
+	$ch =~ s/\'/&#39;/g;	# '
+	$ch =~ s/</&lt;/g;		# <
+	$ch =~ s/>/&gt;/g;		# >
+	return($ch);
+}
+
 sub handleError {
 	my $err = shift;