From 54f033869660ad00f4e0f62582711629960af4c0 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Thu, 9 Feb 2006 17:38:02 +0000 Subject: [PATCH] forward port of 0 file size upgrade fix --- docs/changelog/6.x.x.txt | 1 + lib/WebGUI/Asset/Wobject/EventManagementSystem.pm | 2 +- lib/WebGUI/Storage.pm | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/changelog/6.x.x.txt b/docs/changelog/6.x.x.txt index dc7a17351..85ebe94f6 100644 --- a/docs/changelog/6.x.x.txt +++ b/docs/changelog/6.x.x.txt @@ -32,6 +32,7 @@ - fix [ 1410127 ] User profile fields do not display value \'0\' - fix [ 1427600 ] Prevent Proxy caching on - URL issue - fix [ 1413032 ] AdminBar text unreadable in some cases. w/ fix + - fix [ 1428117 ] Uploading files with 0 size 6.8.5 - fix [ 1396957 ] Insufficient privileges check on the DataForm diff --git a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm index b57da486b..2814ad184 100644 --- a/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm +++ b/lib/WebGUI/Asset/Wobject/EventManagementSystem.pm @@ -545,7 +545,7 @@ sub www_editEvent { }, -defaultValue => "and" -label => $i18n->get("add/edit event operator"), - -label => $i18n->get("add/edit event operator description"), + -hoverHelp => $i18n->get("add/edit event operator description"), ); $f->selectBox( diff --git a/lib/WebGUI/Storage.pm b/lib/WebGUI/Storage.pm index 17d9095aa..707e069f2 100644 --- a/lib/WebGUI/Storage.pm +++ b/lib/WebGUI/Storage.pm @@ -201,6 +201,7 @@ sub addFileFromFormPost { return $filename if $attachmentCount > $attachmentLimit; my $tempFilename = $upload->filename(); next unless $tempFilename; + next unless $upload->size > 0; if ($tempFilename =~ /([^\/\\]+)$/) { $tempFilename = $1; } my $type = $self->getFileExtension($tempFilename); if (isIn($type, qw(pl perl sh cgi php asp))) { # make us safe from malicious uploads