X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Fcollation%2FIcuCollation.php;h=9ac81ae01e99e7b6300d34720f27fd2036038444;hp=efda596335ea3367cd000b205e5bdaecf2b4a533;hb=478a58f63101f2b47d18a618296b5e7970fa3f24;hpb=17e88d99eb768e4181207bbd35656d239ef5d4e8

diff --git a/includes/collation/IcuCollation.php b/includes/collation/IcuCollation.php
index efda596335..9ac81ae01e 100644
--- a/includes/collation/IcuCollation.php
+++ b/includes/collation/IcuCollation.php
@@ -384,9 +384,17 @@ class IcuCollation extends Collation {
 		foreach ( $letters as $letter ) {
 			$key = $this->getPrimarySortKey( $letter );
 			if ( isset( $letterMap[$key] ) ) {
-				// Primary collision
-				// Keep whichever one sorts first in the main collator
-				if ( $this->mainCollator->compare( $letter, $letterMap[$key] ) < 0 ) {
+				// Primary collision (two characters with the same sort position).
+				// Keep whichever one sorts first in the main collator.
+				$comp = $this->mainCollator->compare( $letter, $letterMap[$key] );
+				wfDebug( "Primary collision '$letter' '{$letterMap[$key]}' (comparison: $comp)\n" );
+				// If that also has a collision, use codepoint as a tiebreaker.
+				if ( $comp === 0 ) {
+					// TODO Use <=> operator when PHP 7 is allowed.
+					$comp = UtfNormal\Utils::utf8ToCodepoint( $letter ) -
+						UtfNormal\Utils::utf8ToCodepoint( $letterMap[$key] );
+				}
+				if ( $comp < 0 ) {
 					$letterMap[$key] = $letter;
 				}
 			} else {
@@ -492,7 +500,6 @@ class IcuCollation extends Collation {
 	}
 
 	/**
-	 * @param string $index
 	 * @return string
 	 * @since 1.16.3
 	 */
@@ -551,6 +558,8 @@ class IcuCollation extends Collation {
 		$versionPrefix = substr( $icuVersion, 0, 3 );
 		// Source: http://site.icu-project.org/download
 		$map = [
+			'59.' => '9.0',
+			'58.' => '9.0',
 			'57.' => '8.0',
 			'56.' => '8.0',
 			'55.' => '7.0',