Index: /CKEditor.NET/trunk/CHANGES.html
===================================================================
--- /CKEditor.NET/trunk/CHANGES.html	(revision 6685)
+++ /CKEditor.NET/trunk/CHANGES.html	(revision 6686)
@@ -71,4 +71,5 @@
 	<ul>
 		<li><a href="http://dev.ckeditor.com/ticket/7283">#7283</a> : Entered text is not HTML encoded.</li>
+		<li><a href="http://dev.ckeditor.com/ticket/7302">#7302</a> : It was impossible to customise the editor inside masterpage and if attributes were placed in front of the Control ID.</li>
 	</ul>
 	<h2>
Index: /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs
===================================================================
--- /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 6685)
+++ /CKEditor.NET/trunk/CKEditor.NET/CKEditorControl.cs	(revision 6686)
@@ -65,13 +65,13 @@
 			get
 			{
-				object obj = ViewState["BasePath" + this.ClientID];
+				object obj = ViewState["BasePath"];
 				if (obj == null)
 				{
 					obj = System.Configuration.ConfigurationManager.AppSettings["CKeditor:BasePath"];
-					ViewState["BasePath" + this.ClientID] = (obj == null ? "~/ckeditor" : (string)obj);
-				}
-				return (string)ViewState["BasePath" + this.ClientID];
-			}
-			set { ViewState["BasePath" + this.ClientID] = value; }
+					ViewState["BasePath"] = (obj == null ? "~/ckeditor" : (string)obj);
+				}
+				return (string)ViewState["BasePath"];
+			}
+			set { ViewState["BasePath"] = value; }
 		}
 
@@ -83,9 +83,9 @@
 			get
 			{
-				if (ViewState["CKEditorConfig" + this.ClientID] == null)
-					ViewState["CKEditorConfig" + this.ClientID] = new CKEditorConfig(this.BasePath);
-				return (CKEditorConfig)ViewState["CKEditorConfig" + this.ClientID];
-			}
-			set { ViewState["CKEditorConfig" + this.ClientID] = value; }
+				if (ViewState["CKEditorConfig"] == null)
+					ViewState["CKEditorConfig"] = new CKEditorConfig(this.BasePath);
+				return (CKEditorConfig)ViewState["CKEditorConfig"];
+			}
+			set { ViewState["CKEditorConfig"] = value; }
 		}