Преглед изворни кода

2004-06-14 Gonzalo Paniagua Javier <[email protected]>

	* Control.cs: Modified file.

svn path=/trunk/mcs/; revision=29472
Gonzalo Paniagua Javier пре 21 година
родитељ
комит
23fa50da3b

+ 4 - 0
mcs/class/System.Web/System.Web.UI/ChangeLog

@@ -1,3 +1,7 @@
+2004-06-14 Gonzalo Paniagua Javier <[email protected]>
+
+	* Control.cs: properly fixed bug #59794.
+
 2004-06-10  Gonzalo Paniagua Javier <[email protected]>
 
 	* Control.cs:

+ 4 - 1
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;