Author: kostat
Date: 2007-04-30 11:43:52 -0400 (Mon, 30 Apr 2007)
New Revision: 76502
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI/ChangeLog
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI/DataBinder.cs
Log:
merge -r76500:76501
Modified: branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI/ChangeLog
===================================================================
--- branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI/ChangeLog
2007-04-30 15:41:36 UTC (rev 76501)
+++ branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI/ChangeLog
2007-04-30 15:43:52 UTC (rev 76502)
@@ -1,3 +1,7 @@
+2007-04-30 Konstantin Triger <[EMAIL PROTECTED]>
+
+ * DataBinder.cs: When formatting, threat empty string as null.
+
2007-04-19 Gert Driesen <[EMAIL PROTECTED]>
* TemplateParser.cs: On 2.0 profile, allow namespace in ClassName
Modified:
branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI/DataBinder.cs
===================================================================
--- branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI/DataBinder.cs
2007-04-30 15:41:36 UTC (rev 76501)
+++ branches/mainsoft/gh20/mcs/class/System.Web/System.Web.UI/DataBinder.cs
2007-04-30 15:43:52 UTC (rev 76502)
@@ -47,7 +47,7 @@
if (result == null)
return String.Empty;
- if (format == null)
+ if (format == null || format.Length == 0)
return result.ToString ();
return String.Format (format, result);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
