diff --git a/docs/upgrades/upgrade_6.8.0-6.8.1.pl b/docs/upgrades/upgrade_6.8.0-6.8.1.pl index 251e5f75a..1cd475e32 100644 --- a/docs/upgrades/upgrade_6.8.0-6.8.1.pl +++ b/docs/upgrades/upgrade_6.8.0-6.8.1.pl @@ -36,7 +36,6 @@ sub updateProfileSystem { WebGUI::SQL->write("alter table userProfileField change fieldLabel label varchar(255) not null default 'Undefined'"); WebGUI::SQL->write("alter table userProfileField change dataType fieldType varchar(128) not null default 'text'"); WebGUI::SQL->write("alter table userProfileField change dataValues possibleValues text"); - WebGUI::SQL->write("alter table userProfileField change dataDefault defaultValue text"); WebGUI::SQL->write("alter table userProfileCategory change categoryName label varchar(255) not null default 'Undefined'"); } diff --git a/lib/WebGUI/ErrorHandler.pm b/lib/WebGUI/ErrorHandler.pm index aa59255ab..3f9fbc553 100644 --- a/lib/WebGUI/ErrorHandler.pm +++ b/lib/WebGUI/ErrorHandler.pm @@ -189,7 +189,7 @@ sub fatal { } else { print "

WebGUI Fatal Error

Something unexpected happened that caused this system to fault.

\n"; print "

".$message."

\n"; - print showDebug(); + print showDebug() if (canShowDebug()); } WebGUI::Session::close(); exit; @@ -206,7 +206,8 @@ Returns a reference to the logger. sub getLogger { unless (Log::Log4perl->initialized()) { - Log::Log4perl->init( $WebGUI::Session::session{config}{webguiRoot}."/etc/log.conf" ); + #Log::Log4perl->init( $WebGUI::Session::session{config}{webguiRoot}."/etc/log.conf" ); + Log::Log4perl->init( "/data/WebGUI/etc/log.conf" ); } return Log::Log4perl->get_logger($WebGUI::Session::session{config}{configFile}); } @@ -232,7 +233,7 @@ sub getSessionVars { } elsif (ref $value eq 'HASH') { $value = '{'.join(', ',map {"$_ => $value->{$_}"} keys %$value).'}'; } - unless (lc($key) eq "password" || lc($key) eq "identifier") { + unless (lc($key) eq "password" || lc($key) eq "identifier" || lc($key) eq "dbpass") { $data .= "\t".$section.'.'.$key.' = '.$value."\n"; } } diff --git a/lib/WebGUI/ProfileField.pm b/lib/WebGUI/ProfileField.pm index 478001589..dd3c531c0 100644 --- a/lib/WebGUI/ProfileField.pm +++ b/lib/WebGUI/ProfileField.pm @@ -400,7 +400,7 @@ A scalar indicating the type of field this will be when generated as a form elem A scalar containing a hash reference declaration of possible values. Only used for list type fields. -=head4 defaultValue +=head4 dataDefault A scalar containing an array reference or scalar declaration of defaultly selected value(s). @@ -415,12 +415,12 @@ sub set { $properties->{required} = 0 unless ($properties->{required} == 1); $properties->{label} = 'Undefined' if ($properties->{label} =~ /^[\"\']*$/); $properties->{fieldType} = 'text' unless ($properties->{fieldType}); - if ($properties->{defaultValue} && $properties->{fieldType}=~/List$/) { - unless ($properties->{defaultValue} =~ /^\[/) { - $properties->{defaultValue} = "[".$properties->{defaultValue}; + if ($properties->{dataDefault} && $properties->{fieldType}=~/List$/) { + unless ($properties->{dataDefault} =~ /^\[/) { + $properties->{dataDefault} = "[".$properties->{dataDefault}; } - unless ($properties->{defaultValue} =~ /\]$/) { - $properties->{defaultValue} .= "]"; + unless ($properties->{dataDefault} =~ /\]$/) { + $properties->{dataDefault} .= "]"; } } $properties->{fieldName} = $self->getId;