2010-06-21 Marek Habersack <mhabersack@novell.com>

    	* HtmlControl.cs: PreProcessRelativeReference deos not
    	atribute-encode the attribute value. Fixes bug #596430

    2010-06-21  Marek Habersack  <mhabersack@novell.com>

    	* HtmlImageTest.cs: fixed an invalid test.

svn path=/trunk/mcs/; revision=159250

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
index 21f4e4c746473480570d24dfb6dc758ceba368ca..cd39b762ccec2ffc2ab5fca1986f374109c9bbd9 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-21  Marek Habersack  <mhabersack@novell.com>
+
+       * HtmlControl.cs: PreProcessRelativeReference deos not
+       atribute-encode the attribute value. Fixes bug #596430
+
 2010-06-01  Marek Habersack  <mhabersack@novell.com>
 
        * HtmlHead.cs: added code to render description and keywords metas

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs
index a77b7dbb16922882490a7673260f0dce17d3b524..ad7b11094228c08420c39522ff1b4c926ae435f3 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs
@@ -79,7 +79,7 @@ namespace System.Web.UI.HtmlControls{
                                        catch (Exception) {
                                                throw new HttpException(attribName + " property had malformed url");
                                        }
-                                       writer.WriteAttribute(attribName, attr, true);
+                                       writer.WriteAttribute(attribName, attr);
                                        Attributes.Remove(attribName);
                                }
                        }

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/ChangeLog b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/ChangeLog
index 1a0b0e5b867424a95e8b6c8b9ae3023fe42c2d27..60602835c6811d2cb2b52df407de14cb38030b84 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/ChangeLog
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/ChangeLog
@@ -1,3 +1,7 @@
+2010-06-21  Marek Habersack  <mhabersack@novell.com>
+
+       * HtmlImageTest.cs: fixed an invalid test.
+
 2009-07-06  Raja R Harinath  <harinath@hurrynot.org>
 
        * HtmlFormTest.cs: Derive from SystemWebTestShim.Page to make

diff --git a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlImageTest.cs b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlImageTest.cs
index c99681e9cc5c73df74713b4f6af48fecae36ad65..8f46ed88031fb79687c1fcd29a9b04ab8de1f654 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlImageTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.HtmlControls/HtmlImageTest.cs
@@ -143,7 +143,7 @@ namespace MonoTests.System.Web.UI.HtmlControls {
                        Assert.AreEqual (6, img.Attributes.Count, "Attributes.Count");
 
                        HtmlTextWriter writer = img.GetWriter ();
-                       Assert.AreEqual (" src=\"*5<&*\" align=\"*1*\" alt=\"*2*\" border=\"3\" height=\"4\" width=\"6\" /", writer.InnerWriter.ToString ());
+                       Assert.AreEqual (" src=\"*5<&*\" align=\"*1*\" alt=\"*2*\" border=\"3\" height=\"4\" width=\"6\" /", writer.InnerWriter.ToString ());
                }
        }
 }