Ticket #8608: 8608.patch

CKEditorControl.cs

@@ -90 +90 @@
                         get
                         {
                                 if (ViewState["CKEditorConfig"] == null)
-                                        ViewState["CKEditorConfig"] = new CKEditorConfig(this.BasePath);
+                                        ViewState["CKEditorConfig"] = new CKEditorConfig(this.BasePath.StartsWith("~") ? this.ResolveUrl(this.BasePath) : this.BasePath);
                                 return (CKEditorConfig)ViewState["CKEditorConfig"];
                         }
                         set { ViewState["CKEditorConfig"] = value; }
@@ -1015 +1015 @@
                 public CKEditorControl()
                 {
                         base.TextMode = TextBoxMode.MultiLine;
-                        this.config = new CKEditorConfig(this.BasePath.StartsWith("~") ? this.ResolveUrl(this.BasePath) : this.BasePath);
                 }
 
                 #endregion
@@ -1076 +1075 @@
                         if (isChanged) OnTextChanged(e);
                 }
 
+                protected override void OnLoad(EventArgs e)
+                {
+                        base.OnLoad(e);
+                        if (ViewState["CKEditorConfig"] != null)
+                                this.config = (CKEditorConfig)ViewState["CKEditorConfig"];
+                        else
+                                this.config = new CKEditorConfig(this.BasePath.StartsWith("~") ? this.ResolveUrl(this.BasePath) : this.BasePath);
+                }
+
                 #endregion
 
                 #region Private Method