Author: mhabersack
Date: 2007-02-26 19:06:04 -0500 (Mon, 26 Feb 2007)
New Revision: 73451
Modified:
trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
trunk/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
Log:
Fix FileUpload.HasFile
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-02-26 22:57:06 UTC (rev 73450)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
2007-02-27 00:06:04 UTC (rev 73451)
@@ -1,3 +1,8 @@
+2007-02-27 Marek Habersack <[EMAIL PROTECTED]>
+
+ * FileUpload.cs: HasFile is true only if PostedFile is not null
+ and it actually has an associated file.
+
2007-02-26 Igor Zelmanovich <[EMAIL PROTECTED]>
* LoginView.cs: fixed:
@@ -15,6 +20,7 @@
considers FormsAuthentication.ReturnUrl only if is placed in
the login page defined in web.config.
+>>>>>>> .r73450
2007-02-23 Marek Habersack <[EMAIL PROTECTED]>
* ObjectDataSourceView.cs: Fix saving/restoring the view state.
Modified: trunk/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
===================================================================
--- trunk/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
2007-02-26 22:57:06 UTC (rev 73450)
+++ trunk/mcs/class/System.Web/System.Web.UI.WebControls/FileUpload.cs
2007-02-27 00:06:04 UTC (rev 73451)
@@ -86,7 +86,10 @@
[Browsable (false)]
[DesignerSerializationVisibility
(DesignerSerializationVisibility.Hidden)]
public bool HasFile {
- get { return PostedFile != null; }
+ get {
+ HttpPostedFile pf = PostedFile;
+ return (pf != null && !String.IsNullOrEmpty
(pf.FileName));
+ }
}
[Browsable (false)]
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches