Author: atsushi
Date: 2006-11-27 00:00:14 -0500 (Mon, 27 Nov 2006)
New Revision: 68495
Modified:
branches/mono-1-2-1/mcs/class/corlib/System.Globalization/ChangeLog
branches/mono-1-2-1/mcs/class/corlib/System.Globalization/CompareInfo.cs
Log:
backport r68492.
Modified: branches/mono-1-2-1/mcs/class/corlib/System.Globalization/ChangeLog
===================================================================
--- branches/mono-1-2-1/mcs/class/corlib/System.Globalization/ChangeLog
2006-11-27 04:26:46 UTC (rev 68494)
+++ branches/mono-1-2-1/mcs/class/corlib/System.Globalization/ChangeLog
2006-11-27 05:00:14 UTC (rev 68495)
@@ -1,3 +1,8 @@
+2006-11-27 Atsushi Enomoto <[EMAIL PROTECTED]>
+
+ * CompareInfo.cs : fixed wrong || with && for OrdinalIgnoreCase.
+ Fixed bug #80056.
+
2006-11-10 Marek Safar <[EMAIL PROTECTED]>
* CultureInfo.cs (TextInfo): Construct a culture when is
Modified:
branches/mono-1-2-1/mcs/class/corlib/System.Globalization/CompareInfo.cs
===================================================================
--- branches/mono-1-2-1/mcs/class/corlib/System.Globalization/CompareInfo.cs
2006-11-27 04:26:46 UTC (rev 68494)
+++ branches/mono-1-2-1/mcs/class/corlib/System.Globalization/CompareInfo.cs
2006-11-27 05:00:14 UTC (rev 68495)
@@ -467,7 +467,7 @@
{
return UseManagedCollation &&
#if NET_2_0
- ((CompareOptions.Ordinal & opt) == 0 ||
+ ((CompareOptions.Ordinal & opt) == 0 &&
(CompareOptions.OrdinalIgnoreCase & opt) == 0) ?
#else
(CompareOptions.Ordinal & opt) == 0 ?
@@ -535,7 +535,7 @@
{
return UseManagedCollation &&
#if NET_2_0
- ((CompareOptions.Ordinal & opt) == 0 ||
+ ((CompareOptions.Ordinal & opt) == 0 &&
(CompareOptions.OrdinalIgnoreCase & opt) == 0) ?
#else
(CompareOptions.Ordinal & opt) == 0 ?
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
