diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index b9cf66e01..1b3c0ce6e 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -38,6 +38,7 @@ you can generate non-HTML navigations or take advantate of the Google SiteMap feature. - [ 1433525 ] 6.9: Compilation errors + - base36 removed from Utility.t because it no longer exists in WebGUI::Utility.pm 6.8.7 - fix [ 1431098 ] op=becomeUser can become non-existent userIds diff --git a/lib/WebGUI/Auth.pm b/lib/WebGUI/Auth.pm index 6af91d23e..0ca0bc9c0 100644 --- a/lib/WebGUI/Auth.pm +++ b/lib/WebGUI/Auth.pm @@ -58,7 +58,7 @@ sub _isDuplicateUsername { my ($otherUser) = $self->session->db->quickArray("select count(*) from users where username=".$self->session->db->quote($username)); return 0 if !$otherUser; my $i18n = WebGUI::International->new($self->session); - $self->error('
  • '.$i18n->get(77).' "'.$username.'too", "'.$username.'2", '.'"'.$username.'_'.$self->session->datetime->epochToHuman($self->session->datetime->time(),"%y").'"'.'
  • '); + $self->error(sprintf($i18n->get(77), $username,$username,$username,$self->session->datetime->epochToHuman($self->session->datetime->time(),"%y"))); return 1; } diff --git a/lib/WebGUI/Operation/User.pm b/lib/WebGUI/Operation/User.pm index 120aef79f..44248764b 100644 --- a/lib/WebGUI/Operation/User.pm +++ b/lib/WebGUI/Operation/User.pm @@ -450,7 +450,8 @@ sub www_editUserSave { # Display an error telling them the username they are trying to use is not available and suggest alternatives } else { - $error = ''; + my $username = $session->form->process("username"); + $error = ''; } if ($isSecondary) { return _submenu($session,$i18n->get(978)); diff --git a/lib/WebGUI/i18n/English/WebGUI.pm b/lib/WebGUI/i18n/English/WebGUI.pm index d7e45ee80..807607a3a 100644 --- a/lib/WebGUI/i18n/English/WebGUI.pm +++ b/lib/WebGUI/i18n/English/WebGUI.pm @@ -508,8 +508,12 @@ Be aware that any database links you create here will be available to all conten }, '77' => { - message => q|That account name is already in use by another member of this site. Please try a different username. The following are some suggestions:|, - lastUpdated => 1031514049 + message => q|
  • That account name is already in use by another member of this site. Please try a different username. The following are some suggestions:
    +%sToo
    +%s2
    +%s_%d
    +
  • |, + lastUpdated => 1140292461 }, '444' => { diff --git a/t/Utility.t b/t/Utility.t index b86729acd..655d419fc 100644 --- a/t/Utility.t +++ b/t/Utility.t @@ -20,9 +20,6 @@ use Test::More tests => 22; # increment this value for each test you create my $session = WebGUI::Test->session; -# base 36 -is(WebGUI::Utility::fromBase36(WebGUI::Utility::toBase36(1234567890)), 1234567890, "{to/from}Base36()"); - # commify is(WebGUI::Utility::commify(10), "10", 'commify() - no comma needed'); is(WebGUI::Utility::commify(1000), "1,000", 'commify() - single comma');