Use UNIX line endings consistently

[mono.git] / mcs / class / System.Web / System.Web.UI.WebControls / AdRotator.cs

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
index 5a4aad3512bac3c5fd03663f8924517efdde9641..ea504d18d0d657d29b2d3a3da587f156b39ca7dd 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
@@ -70,7 +70,13 @@ namespace System.Web.UI.WebControls {
                        Hashtable ht = null;
                        
                        if (ad_file != "" && ad_file != null) {
-                               ReadAdsFromFile (Page.MapPath (ad_file));
+                               ReadAdsFromFile (
+#if NET_2_0
+                                       GetPhysicalFilePath (ad_file)
+#else
+                                       Page.MapPath (ad_file)
+#endif
+                               );
                                ht = ChooseAd ();
                        }
 
@@ -118,7 +124,7 @@ namespace System.Web.UI.WebControls {
                                w.AddAttribute (HtmlTextWriterAttribute.Src, ResolveAdUrl (e.ImageUrl));
 
                        w.AddAttribute (HtmlTextWriterAttribute.Alt, e.AlternateText == null ? "" : e.AlternateText);
-                       w.AddAttribute (HtmlTextWriterAttribute.Border, "0");
+                       w.AddAttribute (HtmlTextWriterAttribute.Border, "0", false);
                        w.RenderBeginTag (HtmlTextWriterTag.Img);
                        w.RenderEndTag (); // img
                        w.RenderEndTag (); // a
@@ -127,9 +133,14 @@ namespace System.Web.UI.WebControls {
                string ResolveAdUrl (string url)
                {
                        string path = url;
-                       
+
                        if (AdvertisementFile != null && AdvertisementFile.Length > 0 && path [0] != '/' && path [0] != '~')
-                               return UrlUtils.Combine (UrlUtils.GetDirectory (ResolveUrl (AdvertisementFile)), path);
+                               try {
+                                       new Uri (path);
+                               }
+                               catch {
+                                       return UrlUtils.Combine (UrlUtils.GetDirectory (ResolveUrl (AdvertisementFile)), path);
+                               }
                        
                        return ResolveUrl (path);
                }