merging 6.2.9 changes
This commit is contained in:
parent
1bb82bd7b9
commit
48caad2d74
42 changed files with 224 additions and 119 deletions
|
|
@ -102,8 +102,8 @@ sub _setupUserInfo {
|
|||
from userProfileData, userProfileField where userProfileData.fieldName=userProfileField.fieldName
|
||||
and userProfileData.userId=".quote($user{userId}));
|
||||
%user = (%user, %profile);
|
||||
$user{language} = $session{page}{languageId} if ($user{userId} == 1 || $user{language} eq '');
|
||||
%default = WebGUI::SQL->buildHash("select fieldName, dataDefault from userProfileField where profileCategoryId=4");
|
||||
$user{language} = $session{page}{languageId} if ($user{userId} eq '1' || $user{language} eq '');
|
||||
%default = WebGUI::SQL->buildHash("select fieldName, dataDefault from userProfileField where profileCategoryId='4'");
|
||||
foreach $key (keys %default) {
|
||||
if ($user{$key} eq "") {
|
||||
$value = eval($default{$key});
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue