diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index c7b1b76d7..927137e7c 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,4 +1,7 @@ 7.3.14 + - fix: a typo in DatabaseLink.pm + - fix: a typo in CleanTempSpace.pm + - fix: an unhandled exception in Asset/File.pm - fix: modifiex templates for month, week, and day, added iCal variable links. (thanks to perlDreamer) - fix: added ability for Workflow/Activity/GetCsMail.pm to handle unregistered posters - fix: http://www.plainblack.com/bugs/tracker/dataform-security-bug (thanks to misja) diff --git a/etc/spectre.conf.original b/etc/spectre.conf.original index 284d6dbbf..3fea68de8 100644 --- a/etc/spectre.conf.original +++ b/etc/spectre.conf.original @@ -25,7 +25,7 @@ # can help avoid creating a denial of service attack on overworked # or underpowered servers. -"timeBetweenRunningWorkflows" : 4, +"timeBetweenRunningWorkflows" : 2, # How long should Spectre delay processing a workflow instance when # it gets suspended. It can get suspended if it's waiting for diff --git a/lib/WebGUI/Asset/File.pm b/lib/WebGUI/Asset/File.pm index 8268f358f..f208f5026 100644 --- a/lib/WebGUI/Asset/File.pm +++ b/lib/WebGUI/Asset/File.pm @@ -246,19 +246,21 @@ sub processPropertiesFromFormPost { $self->SUPER::processPropertiesFromFormPost; delete $self->{_storageLocation}; - my $fileStorageId = WebGUI::Form::File->new($self->session,{name => 'file'})->getValueFromPost; - my $storage = WebGUI::Storage->get($self->session, $fileStorageId); - $storage->setPrivileges($self->get('ownerUserId'), $self->get('groupIdView'), $self->get('groupIdEdit')); - my $filename = $storage->getFiles()->[0]; - if (defined $filename && $filename ne $self->get("filename")) { - my %data; - $data{filename} = $filename; - $data{storageId} = $storage->getId; - $data{title} = $filename unless ($self->session->form->process("title")); - $data{menuTitle} = $filename unless ($self->session->form->process("menuTitle")); - $data{url} = $self->getParent->get('url').'/'.$filename unless ($self->session->form->process("url")); - $self->update(\%data); - $self->setSize($storage->getFileSize($filename)); + my $fileStorageId = WebGUI::Form::File->new($self->session, {name => 'file'})->getValueFromPost; + my $storage = WebGUI::Storage->get($self->session, $fileStorageId); + if (defined $storage) { + $storage->setPrivileges($self->get('ownerUserId'), $self->get('groupIdView'), $self->get('groupIdEdit')); + my $filename = $storage->getFiles()->[0]; + if (defined $filename && $filename ne $self->get("filename")) { + my %data; + $data{filename} = $filename; + $data{storageId} = $storage->getId; + $data{title} = $filename unless ($self->session->form->process("title")); + $data{menuTitle} = $filename unless ($self->session->form->process("menuTitle")); + $data{url} = $self->getParent->get('url').'/'.$filename unless ($self->session->form->process("url")); + $self->update(\%data); + $self->setSize($storage->getFileSize($filename)); + } } } diff --git a/lib/WebGUI/DatabaseLink.pm b/lib/WebGUI/DatabaseLink.pm index 50abe1e51..039fea728 100644 --- a/lib/WebGUI/DatabaseLink.pm +++ b/lib/WebGUI/DatabaseLink.pm @@ -139,7 +139,7 @@ sub db { } elsif ($dsn =~ /\DBI\:\w+\:\w+/i) { my $dbh = WebGUI::SQL->connect($self->session,$dsn,$username,$identifier); unless (defined $dbh) { - $self->session->errorHandler->arn("Cannot connect to DatabaseLink [".$self->getId."]"); + $self->session->errorHandler->warn("Cannot connect to DatabaseLink [".$self->getId."]"); } $self->{_dbh} = $dbh; return $self->{_dbh};