oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote branch 'xvaara/master'

Browse source 
Conflicts:
	docs/changelog/7.x.x.txt
This commit is contained in:
Doug Bell 2010-12-07 18:28:24 -06:00
commit 886de768af
6 changed files with 36 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
lib/WebGUI/Auth.pm
View file

@ -310,6 +310,9 @@ sub createAccountSave {
my $userId = $u->userId;
$u->username($username);
$u->authMethod($self->authMethod);
if (!$profile->{'language'} && $self->session->scratch->getLanguageOverride) {
$profile->{'language'} = $self->session->scratch->getLanguageOverride;
}
$u->karma($self->session->setting->get("karmaPerLogin"),"Login","Just for logging in.") if ($self->session->setting->get("useKarma"));
$u->updateProfileFields($profile) if ($profile);
$self->saveParams($userId,$self->authMethod,$properties);

5
lib/WebGUI/ProfileField.pm
View file

@ -335,6 +335,11 @@ sub formField {
if(!defined $properties->{value}) {
$properties->{value} = WebGUI::Operation::Shared::secureEval($session,$properties->{dataDefault});
}
if ($self->getId eq "language") {
if ($self->session->scratch->getLanguageOverride) {
$properties->{value} = $self->session->scratch->getLanguageOverride;
}
}
}
my $form = WebGUI::Form::DynamicField->new($session,%{$properties});
return $form if $returnObject;