Correctly remove parameters array in role files (so we can add/remove email and display name)

This commit is contained in:
Daniel Berteaud 2013-10-03 10:48:41 +02:00
parent 3c7856c549
commit 3d85c4fa95
1 changed files with 3 additions and 5 deletions

View File

@ -89,11 +89,9 @@ foreach my $user (($a->users),$a->get('admin')){
}
}
# As we're here, lets update the email address and the display name
# First, delete parameter if it's an array (meaning it's empty
delete $data->{"\0*\0parameters"} unless(
defined $data->{"\0*\0parameters"}->{'AJXP_REPO_SCOPE_ALL'}->{'core.conf'}->{'email'} ||
defined $data->{"\0*\0parameters"}->{'AJXP_REPO_SCOPE_ALL'}->{'core.conf'}->{'USER_DISPLAY_NAME'}
);
# First, delete parameter if it's an array (meaning it's empty)
delete $data->{"\0*\0parameters"} if (ref ($data->{"\0*\0parameters"})=~ m/ARRAY/i);
$data->{"\0*\0parameters"}->{'AJXP_REPO_SCOPE_ALL'}->{'core.conf'}->{'email'} = "$name\@$domain";
$data->{"\0*\0parameters"}->{'AJXP_REPO_SCOPE_ALL'}->{'core.conf'}->{'USER_DISPLAY_NAME'} = "$first $last";