Fixes from the 5.2.5 bugfix cycle.
This commit is contained in:
parent
6949f42a2c
commit
afbcfc7d56
17 changed files with 2422 additions and 36 deletions
|
|
@ -90,6 +90,7 @@ sub _validateProfileData {
|
|||
while (%field = $a->hash) {
|
||||
if ($field{dataType} eq "date") {
|
||||
$data{$field{fieldName}} = WebGUI::DateTime::setToEpoch($session{form}{$field{fieldName}});
|
||||
$session{form}{$field{fieldName}} = $data{$field{fieldName}};
|
||||
} elsif (exists $session{form}{$field{fieldName}}) {
|
||||
$data{$field{fieldName}} = $session{form}{$field{fieldName}};
|
||||
}
|
||||
|
|
@ -582,6 +583,9 @@ sub www_viewProfile {
|
|||
} else {
|
||||
$value = $u->profileField($data{fieldName});
|
||||
}
|
||||
if ($data{dataType} eq "date") {
|
||||
$value = WebGUI::DateTime::epochToHuman($value,"%z");
|
||||
}
|
||||
unless ($data{fieldName} eq "email" and $u->profileField("publicEmail") < 1) {
|
||||
$output .= '<tr><td class="tableHeader">'.$label.'</td><td class="tableData">'.$value.'</td></tr>';
|
||||
}
|
||||
|
|
|
|||
|
|
@ -130,7 +130,11 @@ sub www_editGroup {
|
|||
-label=>WebGUI::International::get(863)
|
||||
);
|
||||
if ($session{setting}{useKarma}) {
|
||||
$f->integer("karmaThreshold",WebGUI::International::get(538),$g->karmaThreshold);
|
||||
$f->integer(
|
||||
-name=>"karmaThreshold",
|
||||
-label=>WebGUI::International::get(538),
|
||||
-value=>$g->karmaThreshold
|
||||
);
|
||||
}
|
||||
$f->textarea(
|
||||
-name=>"ipFilter",
|
||||
|
|
|
|||
|
|
@ -246,7 +246,6 @@ sub www_editPage {
|
|||
} else {
|
||||
%page = %{$session{page}};
|
||||
($childCount) = WebGUI::SQL->quickArray("select count(*) from page where parentId=$page{pageId}");
|
||||
$page{hideFromNavigation} = 0;
|
||||
}
|
||||
$page{endDate} = (addToDate(time(),10)) if ($page{endDate} < 0);
|
||||
$output = helpIcon(1);
|
||||
|
|
|
|||
|
|
@ -235,6 +235,14 @@ sub www_editProfileFieldSave {
|
|||
$session{form}{fieldLabel} = 'Unamed' if ($session{form}{fieldLabel} eq "" || $session{form}{fieldLabel} eq "''");
|
||||
$test = eval($session{form}{fieldLabel});
|
||||
$session{form}{fieldLabel} = "'".$session{form}{fieldLabel}."'" if ($test eq "");
|
||||
if ($session{form}{dataDefault} ne "") {
|
||||
unless ($session{form}{dataDefault} =~ /^\[/) {
|
||||
$session{form}{dataDefault} = "[".$session{form}{dataDefault};
|
||||
}
|
||||
unless ($session{form}{dataDefault} =~ /\]$/) {
|
||||
$session{form}{dataDefault} .= "]";
|
||||
}
|
||||
}
|
||||
if ($session{form}{new}) {
|
||||
($fieldName) = WebGUI::SQL->quickArray("select count(*) from userProfileField
|
||||
where fieldName=".quote($session{form}{fid}));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue