Item14415: use NFKD when finding insertion point in WikiUsers

foswiki · Jun 7, 2017 · 4a3ace6 · 4a3ace6
1 parent 6cda2e6
commit 4a3ace6
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/TopicUserMappingContrib/lib/Foswiki/Users/TopicUserMapping.pm b/TopicUserMappingContrib/lib/Foswiki/Users/TopicUserMapping.pm
@@ -35,6 +35,8 @@ use Error qw( :try );
 use Foswiki::ListIterator ();
 use Foswiki::Func         ();
 
+use Unicode::Normalize;
+
 #use Monitor;
 #Monitor::MonitorMethod('Foswiki::Users::TopicUserMapping');
 
@@ -393,8 +395,6 @@ sub _maintainUsersTopic {
     my $output     = '';
     foreach my $line ( split( /\r?\n/, $input || '' ) ) {
 
-        # TODO: I18N fix here once basic auth problem with 8-bit user names is
-        # solved
         if ($entry) {
             my ( $web, $name, $odate ) = ( '', '', '' );
             if ( $line =~
@@ -427,7 +427,9 @@ m/^\s+\*\s($Foswiki::regex{webNameRegex}\.)?($Foswiki::regex{wikiWordRegex})\s*(
                 $insidelist = 2;
                 $name       = '';
             }
-            if ( ( $name && ( $wikiname le $name ) ) || $insidelist == 2 ) {
+            if ( ( $name && ( NFKD($wikiname) le NFKD($name) ) )
+                || $insidelist == 2 )
+            {
 
                 # found alphabetical position or last record
                 if ( $wikiname eq $name ) {