From bfe568018637afad544f38b538ef9f6d9aad068f Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Tue, 19 Mar 2013 10:48:08 +0100 Subject: [PATCH] Bug 6874: QA follow-up Squash of the following commits: return with explicit undef removed Follow-up for PBP fixes follow-up fix POD syntax follow-up jquery has moved Signed-off-by: Paul Poulain Signed-off-by: Jared Camins-Esakov Signed-off-by: Mark Tompsett Signed-off-by: Bernardo Gonzalez Kriegel Signed-off-by: Marcel de Rooy Amended: removed POD changes in Biblio.pm while rebasing. Signed-off-by: Tomas Cohen Arazi --- C4/UploadedFiles.pm | 2 +- cataloguing/value_builder/upload.pl | 2 +- .../prog/en/modules/cataloguing/value_builder/upload.tt | 2 +- opac/opac-retrieve-file.pl | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/C4/UploadedFiles.pm b/C4/UploadedFiles.pm index 246b02b8ee..1574e99ba5 100644 --- a/C4/UploadedFiles.pm +++ b/C4/UploadedFiles.pm @@ -180,7 +180,7 @@ sub UploadFile { return $id; } - return undef; + return; } =head2 DelUploadedFile diff --git a/cataloguing/value_builder/upload.pl b/cataloguing/value_builder/upload.pl index 0cb33f4774..03ad77b55a 100755 --- a/cataloguing/value_builder/upload.pl +++ b/cataloguing/value_builder/upload.pl @@ -140,7 +140,7 @@ sub finddirs { my $base = shift || $upload_path; my $found = 0; my @dirs; - my @files = <$base/*>; + my @files = glob("$base/*"); foreach (@files) { if (-d $_ and -w $_) { my $lastdirname = basename($_); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt index 4fae58a7e2..da40360a1a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt @@ -4,7 +4,7 @@ Upload plugin - + diff --git a/opac/opac-retrieve-file.pl b/opac/opac-retrieve-file.pl index ddbf1ac574..d5406e6225 100755 --- a/opac/opac-retrieve-file.pl +++ b/opac/opac-retrieve-file.pl @@ -32,12 +32,12 @@ exit 1 if not $file; my $file_path = $file->{filepath}; if( -f $file_path ) { - open FH, '<', $file_path or die "Can't open file: $!"; + open my $fh, '<', $file_path or die "Can't open file: $!"; print $input->header( -type => "application/octet-stream", -attachment => $file->{filename} ); - while() { + while(<$fh>) { print $_; } } else {