bryce/mediawiki-extensions-UniversalLanguageSelector
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor getCodepoint() to more consistently handle return values

Browse Source 
Change-Id: Ida90e6c78be41e8527eaefd14feb45c57413945e
This commit is contained in:
Siebrand Mazeland
2013-08-05 06:37:50 +02:00
parent 3e54cd9de8
commit b19b89374d
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
data/LanguageNameSearch.php
View File

@@ -75,11 +75,16 @@ class LanguageNameSearch {
$values = array(); $values = array();
$lookingFor = 1; $lookingFor = 1;
$strLen = strlen( $str ); $strLen = strlen( $str );
$number = 0;
for ( $i = 0; $i < $strLen; $i++ ) { for ( $i = 0; $i < $strLen; $i++ ) {
$thisValue = ord( $str[$i] ); $thisValue = ord( $str[$i] );
if ( $thisValue < 128 ) { if ( $thisValue < 128 ) {
return $thisValue; $number = $thisValue;
} else { // Codepoints larger than 127 are represented by multi-byte sequences
break;
} else {
// Codepoints larger than 127 are represented by multi-byte sequences
if ( count( $values ) === 0 ) { if ( count( $values ) === 0 ) {
// 224 is the lowest non-overlong-encoded codepoint. // 224 is the lowest non-overlong-encoded codepoint.
$lookingFor = ( $thisValue < 224 ) ? 2 : 3; $lookingFor = ( $thisValue < 224 ) ? 2 : 3;
@@ -97,10 +102,12 @@ class LanguageNameSearch {
$number += $values[1] % 64; $number += $values[1] % 64;
} }
return $number; break;
} }
} }
} }
return $number;
} }
/** /**