From d4f00f2824d50ec69c6193387f342002fa310a6f Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Wed, 16 Dec 2015 15:54:49 +0100 Subject: [PATCH] Bug 15225: [QA Follow-up] Improve changes to gethtml5media Content-Type: text/plain; charset=utf-8 [1] Improve readability, add some checks. [2] Add the public flag for OPAC use. (If a file has not been marked as public, we should not return it in OPAC.) Test plan: See original commit. No changes in behavior. Signed-off-by: Marcel de Rooy Verified results with some additional debug lines. Somehow, showing the results in the browser was harder. This is not related to the changes on this report, but probably to the surrounding code. --- C4/HTML5Media.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/C4/HTML5Media.pm b/C4/HTML5Media.pm index 2bdb794..a7e7c20 100644 --- a/C4/HTML5Media.pm +++ b/C4/HTML5Media.pm @@ -111,7 +111,12 @@ sub gethtml5media { # extension # check uploaded files if ( $HTML5Media{srcblock} =~ /\Qopac-retrieve-file.pl\E/ ) { - $HTML5Media{extension} = (Koha::Upload->new->get({ hashvalue => (split(/id=/, $HTML5Media{srcblock}))[1] })->{name} =~ m/([^.]+)$/)[0]; + my ( undef, $id ) = split /id=/, $HTML5Media{srcblock}; + next if !$id; + my $public = ( ( caller )[1] =~ /opac/ ) ? { public => 1 }: {}; + my $upl = Koha::Upload->new( $public )->get({ hashvalue => $id }); + next if !$upl; + $HTML5Media{extension} = ( $upl->{name} =~ m/([^.]+)$/ )[0]; } # check remote files else { -- 1.7.10.4