Changeset 1172 for FCKeditor.Net/trunk/FCKeditor.cs

Timestamp:

2007-12-04 13:26:38 (10 months ago)

Author:

fredck

Message:

Fixed #294 : The HtmlEncodeOutput setting is enforced by the editor component, to avoid having to set ValidateRequest="false" on pages using the editor.

Files:

• FCKeditor.Net/trunk/FCKeditor.cs (modified) (2 diffs)

FCKeditor.Net/trunk/FCKeditor.cs

@@ -321 +321 @@
                 }
 
+                [Category( "Configurations" )]
+                public bool HtmlEncodeOutput
+                {
+                        set { this.Config[ "HtmlEncodeOutput" ] = ( value ? "true" : "false" ); }
+                }
+
                 #endregion
 
@@ -446 +452 @@
                 public bool LoadPostData(string postDataKey, System.Collections.Specialized.NameValueCollection postCollection)
                 {
-                        if ( postCollection[postDataKey] != this.Value )
-                        {
-                                this.Value = postCollection[postDataKey] ;
+                        string postedValue = postCollection[postDataKey] ;
+
+                        // Revert the HtmlEncodeOutput changes.
+                        if ( this.Config["HtmlEncodeOutput"] != "false" )
+                        {
+                                postedValue = postedValue.Replace( "&", "&" ) ;
+                                postedValue = postedValue.Replace( "&lt;", "<" ) ;
+                                postedValue = postedValue.Replace( "&gt;", ">" ) ;
+                        }
+
+                        if ( postedValue != this.Value )
+                        {
+                                this.Value = postedValue ;
                                 return true ;
                         }