X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FCollation.php;h=ad2b94b1772830bfe0e8145f45c9d31519281173;hb=e7888d8f12110decc9f0435193f0cd222eaae5a9;hp=4cd921d95c3cece6d2ccbe17254143b1778ad278;hpb=783d4e086228c4699efca02b29914aa72013ebf8;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/Collation.php b/includes/Collation.php
index 4cd921d95c..ad2b94b177 100644
--- a/includes/Collation.php
+++ b/includes/Collation.php
@@ -1,4 +1,24 @@
 <?php
+/**
+ * Database row sorting.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ */
 
 abstract class Collation {
 	static $instance;
@@ -23,9 +43,21 @@ abstract class Collation {
 		switch( $collationName ) {
 			case 'uppercase':
 				return new UppercaseCollation;
+			case 'identity':
+				return new IdentityCollation;
 			case 'uca-default':
 				return new IcuCollation( 'root' );
 			default:
+				# Provide a mechanism for extensions to hook in.
+
+				$collationObject = null;
+				wfRunHooks( 'Collation::factory', array( $collationName, &$collationObject ) );
+
+				if ( $collationObject instanceof Collation ) {
+					return $collationObject;
+				}
+
+				// If all else fails...
 				throw new MWException( __METHOD__.": unknown collation type \"$collationName\"" );
 		}
 	}
@@ -89,6 +121,30 @@ class UppercaseCollation extends Collation {
 	}
 }
 
+/**
+ * Collation class that's essentially a no-op.
+ *
+ * Does sorting based on binary value of the string.
+ * Like how things were pre 1.17.
+ */
+class IdentityCollation extends Collation {
+
+	function getSortKey( $string ) {
+		return $string;
+	}
+
+	function getFirstLetter( $string ) {
+		global $wgContLang;
+		// Copied from UppercaseCollation.
+		// I'm kind of unclear on when this could happen...
+		if ( $string[0] == "\0" ) {
+			$string = substr( $string, 1 );
+		}
+		return $wgContLang->firstChar( $string );
+	}
+}
+
+
 class IcuCollation extends Collation {
 	var $primaryCollator, $mainCollator, $locale;
 	var $firstLetterData;
@@ -275,7 +331,7 @@ class IcuCollation extends Collation {
 	 *     -1, 0 or 1 in the style of strcmp().
 	 * @param $target string The target value to find.
 	 *
-	 * @return The item index of the lower bound, or false if the target value
+	 * @return int|bool The item index of the lower bound, or false if the target value
 	 *     sorts before all items.
 	 */
 	function findLowerBound( $valueCallback, $valueCount, $comparisonCallback, $target ) {