backport r68492.

svn path=/branches/mono-1-2-1/mcs/; revision=68495
mono · Nov 27, 2006 · 3bb68f1 · 3bb68f1
1 parent 8578364
commit 3bb68f1
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/mcs/class/corlib/System.Globalization/ChangeLog b/mcs/class/corlib/System.Globalization/ChangeLog
@@ -1,3 +1,8 @@
+2006-11-27  Atsushi Enomoto  <atsushi@ximian.com>
+
+	* CompareInfo.cs : fixed wrong || with && for OrdinalIgnoreCase.
+	  Fixed bug #80056.
+
 2006-11-10  Marek Safar  <marek.safar@gmail.com>
 
 	* CultureInfo.cs (TextInfo): Construct a culture when is

diff --git a/mcs/class/corlib/System.Globalization/CompareInfo.cs b/mcs/class/corlib/System.Globalization/CompareInfo.cs
@@ -467,7 +467,7 @@ private int internal_index_switch (string s, int sindex,
 		{
 			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 @@ private int internal_index_switch (string s1, int sindex,
 		{
 			return UseManagedCollation &&
 #if NET_2_0
-				((CompareOptions.Ordinal & opt) == 0 ||
+				((CompareOptions.Ordinal & opt) == 0 &&
 				(CompareOptions.OrdinalIgnoreCase & opt) == 0) ?
 #else
 				(CompareOptions.Ordinal & opt) == 0 ?