Siebrand has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/77650


Change subject: Refactor getCodepoint() to more consistently handle return 
values
......................................................................

Refactor getCodepoint() to more consistently handle return values

Change-Id: Ida90e6c78be41e8527eaefd14feb45c57413945e
---
M data/LanguageNameSearch.php
1 file changed, 7 insertions(+), 2 deletions(-)


  git pull 
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector 
refs/changes/50/77650/1

diff --git a/data/LanguageNameSearch.php b/data/LanguageNameSearch.php
index 6d882ec..4638e05 100644
--- a/data/LanguageNameSearch.php
+++ b/data/LanguageNameSearch.php
@@ -74,10 +74,14 @@
        static function getCodepoint( $str ) {
                $values = array();
                $lookingFor = 1;
+               $number = 0;
+
                for ( $i = 0; $i < strlen( $str ); $i++ ) {
                        $thisValue = ord( $str[$i] );
                        if ( $thisValue < 128 ) {
-                               return $thisValue;
+                               $number = $thisValue;
+
+                               break;
                        } else { // Codepoints larger than 127 are represented 
by multi-byte sequences,
                                if ( count( $values ) === 0 ) {
                                        // 224 is the lowest 
non-overlong-encoded codepoint.
@@ -88,10 +92,11 @@
                                        // Refer 
http://en.wikipedia.org/wiki/UTF-8#Description
                                        $number = ( $lookingFor === 3 ) ? ( ( 
$values[0] % 16 ) * 4096 ) + ( ( $values[1] % 64 ) * 64 ) + ( $values[2] % 64 ) 
: ( ( $values[0] % 32 ) * 64 ) + ( $values[1] % 64 );
 
-                                       return $number;
+                                       break;
                                }
                        }
                }
+               return $number;
        }
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/77650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida90e6c78be41e8527eaefd14feb45c57413945e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector
Gerrit-Branch: master
Gerrit-Owner: Siebrand <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to