diff options
author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2003-12-03 21:54:09 +0300 |
---|---|---|
committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2003-12-03 21:54:09 +0300 |
commit | 012ba810dbe6264d38b0b889fd628bb69df58b89 (patch) | |
tree | 71a29c7c2b245c5669de0398b93953c5df2dc97e /mcs | |
parent | 3d5f46ed19d2a93db4e9b45f74147b0a4f6029f3 (diff) |
2003-12-03 Gonzalo Paniagua Javier <gonzalo@ximian.com>
* HtmlContainerControl.cs: encode/decode InnerText. Fixes bug #51653.
svn path=/trunk/mcs/; revision=20750
Diffstat (limited to 'mcs')
-rw-r--r-- | mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog | 4 | ||||
-rw-r--r-- | mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog index 4df947a907b..61af3988cb5 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog @@ -1,5 +1,9 @@ 2003-12-03 Gonzalo Paniagua Javier <gonzalo@ximian.com> + * HtmlContainerControl.cs: encode/decode InnerText. Fixes bug #51653. + +2003-12-03 Gonzalo Paniagua Javier <gonzalo@ximian.com> + * HtmlSelect.cs: with the new LosFormatter, we get array types right, so remove the code used to workaround that. diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs index 180dbe69f16..a24d8ca6d71 100644 --- a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs +++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs @@ -80,11 +80,11 @@ namespace System.Web.UI.HtmlControls public virtual string InnerText { get { - return InnerHtml; //FIXME: decode it + return HttpUtility.HtmlDecode (InnerHtml); } set { - InnerHtml = value; //FIXME: encode it + InnerHtml = HttpUtility.HtmlEncode (value); } } |