diff options
| author | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2004-08-10 22:06:42 +0400 |
|---|---|---|
| committer | Gonzalo Paniagua Javier <gonzalo.mono@gmail.com> | 2004-08-10 22:06:42 +0400 |
| commit | a21cc56436526504099e0feb478f098c056a3528 (patch) | |
| tree | b2cbdad9eb1617c76f0b9ff39013779835ba7e88 /mcs | |
| parent | eb19dfc3f83512c8f16bad3a6ceddc438cad5559 (diff) | |
same fix as in HEAD
svn path=/branches/mono-1-0/mcs/; revision=32164
Diffstat (limited to 'mcs')
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog | 9 | ||||
| -rw-r--r-- | mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs | 6 |
2 files changed, 9 insertions, 6 deletions
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog index 7927b3f9e10..dace1da7b57 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog @@ -1,3 +1,8 @@ +2004-08-10 Gonzalo Paniagua Javier <gonzalo@ximian.com> + + * Xml.cs: use MapPath in DocumentSource and documentContent. Fixes + bug #62726. + 2004-07-29 Gonzalo Paniagua Javier <gonzalo@ximian.com> * BaseValidator.cs: in Validate(), when the control is not visible or @@ -5,8 +10,8 @@ #61831. 2004-06-10 Alon Gazit <along@mainsoft.com> - * WebControl.cs: fixed LoadViewState(). - Creates new attributes state bag only when the current is null. + * WebControl.cs: fixed LoadViewState(). + Creates new attributes state bag only when the current is null. 2004-06-07 Gonzalo Paniagua Javier <gonzalo@ximian.com> diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs index 7cdb7e4fea8..ff9aacac78b 100644 --- a/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs +++ b/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs @@ -189,21 +189,19 @@ namespace System.Web.UI.WebControls GetType().Name)); } - [MonoTODO("security")] private void LoadXpathDoc () { if (documentContent != null && documentContent.Length > 0) { - xpathDoc = new XPathDocument (new StringReader (documentContent)); + xpathDoc = new XPathDocument (new StringReader (MapPathSecure (documentContent))); return; } if (documentSource != null && documentSource.Length != 0) { - xpathDoc = new XPathDocument (documentSource); + xpathDoc = new XPathDocument (MapPathSecure (documentSource)); return; } } - [MonoTODO("security")] private void LoadTransform () { if (transform != null) |