merging 5.4.3 changes

This commit is contained in:
JT Smith 2003-07-27 21:32:32 +00:00
parent c1f4105699
commit dc9a81080a
17 changed files with 106 additions and 51 deletions

View file

@ -260,7 +260,7 @@ sub www_editGrouping {
sub www_editGroupingSave {
return WebGUI::Privilege::adminOnly() unless (WebGUI::Privilege::isInGroup(3));
WebGUI::Grouping::userGroupExpireDate($session{form}{uid},$session{form}{gid},setToEpoch($session{form}{expireDate}));
WebGUI::Grouping::userGroupAdmin($session{form}{uid},$session{form}{gid},setToEpoch($session{form}{groupAdmin}));
WebGUI::Grouping::userGroupAdmin($session{form}{uid},$session{form}{gid},$session{form}{groupAdmin});
return www_editUserGroup();
}
@ -429,7 +429,7 @@ sub www_editUserProfile {
} elsif ($method) {
if ($session{form}{$data{fieldName}}) {
$default = $session{form}{$data{fieldName}};
} elsif (exists $session{user}{$data{fieldName}}) {
} elsif (exists $user{$data{fieldName}}) {
$default = $user{$data{fieldName}};
} else {
$default = eval $data{dataDefault};