View | Details | Raw Unified | Return to bug 21848
Collapse All | Expand All

(-)a/Koha/Patron.pm (-1 / +2 lines)
Lines 21-26 package Koha::Patron; Link Here
21
use Modern::Perl;
21
use Modern::Perl;
22
22
23
use Carp;
23
use Carp;
24
use Encode qw/encode_utf8 decode_utf8/;
24
use List::MoreUtils qw( uniq );
25
use List::MoreUtils qw( uniq );
25
use JSON qw( to_json );
26
use JSON qw( to_json );
26
use Text::Unaccent qw( unac_string );
27
use Text::Unaccent qw( unac_string );
Lines 1313-1319 sub generate_userid { Link Here
1313
      $firstname =~ s/[[:digit:][:space:][:blank:][:punct:][:cntrl:]]//g;
1314
      $firstname =~ s/[[:digit:][:space:][:blank:][:punct:][:cntrl:]]//g;
1314
      $surname =~ s/[[:digit:][:space:][:blank:][:punct:][:cntrl:]]//g;
1315
      $surname =~ s/[[:digit:][:space:][:blank:][:punct:][:cntrl:]]//g;
1315
      my $userid = lc(($firstname)? "$firstname.$surname" : $surname);
1316
      my $userid = lc(($firstname)? "$firstname.$surname" : $surname);
1316
      $userid = unac_string('utf-8',$userid);
1317
      $userid = decode_utf8(unac_string('utf-8',encode_utf8($userid)));
1317
      $userid .= $offset unless $offset == 0;
1318
      $userid .= $offset unless $offset == 0;
1318
      $self->userid( $userid );
1319
      $self->userid( $userid );
1319
      $offset++;
1320
      $offset++;
(-)a/t/db_dependent/Koha/Patrons.t (-3 / +3 lines)
Lines 18-23 Link Here
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
18
# along with Koha; if not, see <http://www.gnu.org/licenses>.
19
19
20
use Modern::Perl;
20
use Modern::Perl;
21
use utf8;
21
22
22
use Test::More tests => 34;
23
use Test::More tests => 34;
23
use Test::Warn;
24
use Test::Warn;
Lines 1389-1396 subtest 'generate_userid' => sub { Link Here
1389
    );
1390
    );
1390
    my %data = (
1391
    my %data = (
1391
        cardnumber   => "123456789",
1392
        cardnumber   => "123456789",
1392
        firstname    => "Tomasito",
1393
        firstname    => "Tomasíto", # accent
1393
        surname      => "None",
1394
        surname      => "Ñòñé", # accents
1394
        categorycode => $patron_category->categorycode,
1395
        categorycode => $patron_category->categorycode,
1395
        branchcode   => $library->branchcode,
1396
        branchcode   => $library->branchcode,
1396
    );
1397
    );
1397
- 

Return to bug 21848