X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCollation.php;h=3cc7902855d1210962cc926308d9bf80b4c07863;hb=55e064e3f89f2c362b8de76b2a69d9f07fe52508;hp=8554c2b047a2fb9bff5d6c3ea80fbb432eddaebc;hpb=51c25010b52edbb335ef1bd9c0d2803ae6c62477;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Collation.php b/includes/Collation.php
index 8554c2b047..3cc7902855 100644
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -335,8 +335,12 @@ class IcuCollation extends Collation {
 	 *     sorts before all items.
 	 */
 	function findLowerBound( $valueCallback, $valueCount, $comparisonCallback, $target ) {
+		if ( $valueCount === 0 ) {
+			return false;
+		}
+
 		$min = 0;
-		$max = $valueCount - 1;
+		$max = $valueCount;
 		do {
 			$mid = $min + ( ( $max - $min ) >> 1 );
 			$item = call_user_func( $valueCallback, $mid );
@@ -351,12 +355,15 @@ class IcuCollation extends Collation {
 			}
 		} while ( $min < $max - 1 );
 
-		if ( $min == 0 && $max == 0 && $comparison > 0 ) {
-			// Before the first item
-			return false;
-		} else {
-			return $min;
+		if ( $min == 0 ) {
+			$item = call_user_func( $valueCallback, $min );
+			$comparison = call_user_func( $comparisonCallback, $target, $item );
+			if ( $comparison < 0 ) {
+				// Before the first item
+				return false;
+			}
 		}
+		return $min;
 	}
 
 	static function isCjk( $codepoint ) {