Skip to content

Commit 194d2f7

Browse files
authored
Merge pull request #1027 from dpvc/issue1022
Check for proper action (non-capitalized) in getFile().
2 parents 59fbe69 + d79ace3 commit 194d2f7

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

lib/WeBWorK/ContentGenerator/Instructor/FileManager.pm

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,7 @@ sub HiddenFlags {
239239
#
240240
# Display the directory listing and associated buttons
241241
#
242+
242243
sub Refresh {
243244
my $self = shift;
244245
my $r = $self->r;
@@ -1001,23 +1002,23 @@ sub getFile {
10011002
my @files = $self->r->param("files");
10021003
if (scalar(@files) > 1) {
10031004
$self->addbadmessage($r->maketext("You can only [_1] one file at a time.",$action));
1004-
$self->Refresh unless ($action eq 'Download' || $action eq $r->maketext('Download'));
1005+
$self->Refresh unless $action eq 'download';
10051006
return;
10061007
}
10071008
if (scalar(@files) == 0 || $files[0] eq "") {
10081009
$self->addbadmessage($r->maketext("You need to select a file to [_1].",$action));
1009-
$self->Refresh unless ($action eq 'Download' || $action eq $r->maketext('Download'));
1010+
$self->Refresh unless $action eq 'download';
10101011
return;
10111012
}
10121013
my $pwd = $self->checkPWD($self->{pwd} || $self->r->param('pwd') || HOME) || '.';
10131014
if ($self->isSymLink($pwd.'/'.$files[0])) {
10141015
$self->addbadmessage($r->maketext("That symbolic link takes you outside your course directory"));
1015-
$self->Refresh unless ($action eq 'Download' || $action eq $r->maketext('Download'));
1016+
$self->Refresh unless $action eq 'download';
10161017
return;
10171018
}
10181019
unless ($self->checkPWD($pwd.'/'.$files[0],1)) {
10191020
$self->addbadmessage($r->maketext("You have specified an illegal file"));
1020-
$self->Refresh unless ($action eq 'Download' || $action eq $r->maketext('Download'));
1021+
$self->Refresh unless $action eq 'download';
10211022
return;
10221023
}
10231024
return $files[0];

0 commit comments

Comments
 (0)