fixed bug 677283

This commit is contained in:
JT Smith 2003-02-09 04:06:53 +00:00
parent 787870aa45
commit 4b3c19ce74
3 changed files with 16 additions and 6 deletions

View file

@ -9,8 +9,8 @@ insert into international (internationalId,languageId,namespace,message,lastUpda
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (858,1,'WebGUI','Alias', 1043879848);
INSERT INTO userProfileField VALUES ('alias','WebGUI::International::get(858)',1,0,'text','','',4,3,0);
INSERT INTO userProfileField VALUES ('signature','WebGUI::International::get(859)',1,0,'HTMLArea','','',5,3,0);
INSERT INTO userProfileField VALUES ('publicProfile','WebGUI::International::get(861)',1,0,'yesNo','','[1]',9,4,0);
INSERT INTO userProfileField VALUES ('publicEmail','WebGUI::International::get(860)',1,0,'yesNo','','[1]',10,4,0);
INSERT INTO userProfileField VALUES ('publicProfile','WebGUI::International::get(861)',1,0,'yesNo','','1',9,4,0);
INSERT INTO userProfileField VALUES ('publicEmail','WebGUI::International::get(860)',1,0,'yesNo','','1',10,4,0);
insert into international (internationalId,languageId,namespace,message,lastUpdated) values (862,1,'WebGUI','This user\'s profile is not public.', 1043881275);
alter table groups add column dateCreated int not null default 997938000;
alter table groups add column lastUpdated int not null default 997938000;

View file

@ -320,9 +320,13 @@ sub www_editProfile {
-subtext=>$subtext
);
} else {
$default = $session{form}{$data{fieldName}}
|| $session{user}{$data{fieldName}}
|| eval $data{dataDefault};
if ($session{form}{$data{fieldName}}) {
$default = $session{form}{$data{fieldName}};
} elsif (exists $session{user}{$data{fieldName}}) {
$default = $session{user}{$data{fieldName}};
} else {
$default = eval $data{dataDefault};
}
$f->$method(
-name=>$data{fieldName},
-label=>$label,

View file

@ -356,7 +356,13 @@ sub www_editUserProfile {
}
$f->select($data{fieldName},$values,$label,$default);
} elsif ($method) {
$default = $session{form}{$data{fieldName}} || $user{$data{fieldName}} || eval $data{dataDefault};
if ($session{form}{$data{fieldName}}) {
$default = $session{form}{$data{fieldName}};
} elsif (exists $session{user}{$data{fieldName}}) {
$default = $user{$data{fieldName}};
} else {
$default = eval $data{dataDefault};
}
$f->$method($data{fieldName},$label,$default);
}
$previousCategory = $category;