Merge "Fix Undefined offset notice"

This commit is contained in:
jenkins-bot
2013-04-26 15:27:23 +00:00
committed by Gerrit Code Review

View File

@@ -28,11 +28,17 @@ class LanguageNameSearch {
if ( self::$languagenames === null ) { if ( self::$languagenames === null ) {
self::init(); self::init();
} }
// @todo: Shouldn't this be unicode aware?
$searchKey = strtolower( $searchKey ); $searchKey = strtolower( $searchKey );
$bucket = self::$languagenames[self::getIndex( $searchKey )]; $index = self::getIndex( $searchKey );
if ( !$bucket ) {
if ( !isset( self::$languagenames[$index] ) ) {
return array(); return array();
} }
$bucket = self::$languagenames[$index];
$results = array(); $results = array();
foreach ( $bucket as $name => $code ) { foreach ( $bucket as $name => $code ) {
// Prefix search // Prefix search
@@ -55,9 +61,6 @@ class LanguageNameSearch {
} else { } else {
$bucket = $codepoint % 1000; $bucket = $codepoint % 1000;
} }
if ( !isset( $buckets[$bucket] ) ) {
$buckets[$bucket] = array();
}
return $bucket; return $bucket;
} }