From 23fa50da3b11b60ef4a2644044f64adb801bfa81 Mon Sep 17 00:00:00 2001 From: Gonzalo Paniagua Javier Date: Mon, 14 Jun 2004 03:36:28 +0000 Subject: 2004-06-14 Gonzalo Paniagua Javier * Control.cs: Modified file. svn path=/trunk/mcs/; revision=29472 --- mcs/class/System.Web/System.Web.UI/ChangeLog | 4 ++++ mcs/class/System.Web/System.Web.UI/Control.cs | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'mcs/class/System.Web/System.Web.UI') diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog index 43cdf8b2873..e6fd64d77a1 100644 --- a/mcs/class/System.Web/System.Web.UI/ChangeLog +++ b/mcs/class/System.Web/System.Web.UI/ChangeLog @@ -1,3 +1,7 @@ +2004-06-14 Gonzalo Paniagua Javier + + * Control.cs: properly fixed bug #59794. + 2004-06-10 Gonzalo Paniagua Javier * Control.cs: diff --git a/mcs/class/System.Web/System.Web.UI/Control.cs b/mcs/class/System.Web/System.Web.UI/Control.cs index 6771c00d875..3fb9866b73e 100644 --- a/mcs/class/System.Web/System.Web.UI/Control.cs +++ b/mcs/class/System.Web/System.Web.UI/Control.cs @@ -766,7 +766,10 @@ namespace System.Web.UI return relativeUrl; string ts = TemplateSourceDirectory; - if (ts == "" || UrlUtils.IsRelativeUrl (relativeUrl)) + if (ts == "" || !UrlUtils.IsRelativeUrl (relativeUrl)) + return relativeUrl; + + if (relativeUrl.IndexOf ('/') == -1 && relativeUrl [0] != '.' && relativeUrl != "..") return relativeUrl; HttpResponse resp = Context.Response; -- cgit v1.2.3