jenkins-bot has submitted this change and it was merged.
Change subject: Fix Undefined offset notice
......................................................................
Fix Undefined offset notice
Also removed some dead code that never ran, there is no variable named
"$buckets" so it'll never have an offset.
Bug: 45327
Change-Id: I1f70ef0ec4f2434f9f072e718140ff8050b81ba3
---
M data/LanguageNameSearch.php
1 file changed, 8 insertions(+), 5 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/data/LanguageNameSearch.php b/data/LanguageNameSearch.php
index b662afc..6d882ec 100644
--- a/data/LanguageNameSearch.php
+++ b/data/LanguageNameSearch.php
@@ -28,11 +28,17 @@
if ( self::$languagenames === null ) {
self::init();
}
+
+ // @todo: Shouldn't this be unicode aware?
$searchKey = strtolower( $searchKey );
- $bucket = self::$languagenames[self::getIndex( $searchKey )];
- if ( !$bucket ) {
+ $index = self::getIndex( $searchKey );
+
+ if ( !isset( self::$languagenames[$index] ) ) {
return array();
}
+
+ $bucket = self::$languagenames[$index];
+
$results = array();
foreach ( $bucket as $name => $code ) {
// Prefix search
@@ -54,9 +60,6 @@
$bucket = $codepoint;
} else {
$bucket = $codepoint % 1000;
- }
- if ( !isset( $buckets[$bucket] ) ) {
- $buckets[$bucket] = array();
}
return $bucket;
--
To view, visit https://gerrit.wikimedia.org/r/60831
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1f70ef0ec4f2434f9f072e718140ff8050b81ba3
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
