X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=C4%2FHTML5Media.pm;h=1ac22f17c32675eb8cb569ee72c1121a98df73c6;hb=2266733767536ddf47f31821ba87d860c246700f;hp=462f6b41832adc6845601991277b11003a286ea1;hpb=b1dc5092d82fd0952ce4e9b586842f5ccb7a4377;p=koha.git

diff --git a/C4/HTML5Media.pm b/C4/HTML5Media.pm
index 462f6b4183..1ac22f17c3 100644
--- a/C4/HTML5Media.pm
+++ b/C4/HTML5Media.pm
@@ -22,7 +22,7 @@ use warnings;
 
 use C4::Context;
 use MARC::Field;
-use Koha::Upload;
+use Koha::UploadedFiles;
 
 =head1 HTML5Media
 
@@ -98,7 +98,7 @@ sub gethtml5media {
         # src
         if ( $HTML5Media_field->subfield('u') ) {
             $HTML5Media{srcblock} = $HTML5Media_field->subfield('u');
-            if (grep /youtube|youtu[.]be/, $HTML5Media_field->subfield('u') ) {
+            if (grep /youtu\.?be/, $HTML5Media_field->subfield('u') ) {
                 if ($HTML5MediaYouTube == 1) {
                     require WWW::YouTube::Download;
                     import  WWW::YouTube::Download qw(playback_url);
@@ -134,10 +134,12 @@ sub gethtml5media {
         if ( $HTML5Media{srcblock} =~ /\Qopac-retrieve-file.pl\E/ ) {
             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 || $upl->{name} !~ /\./;
-            $HTML5Media{extension} = ( $upl->{name} =~ m/([^.]+)$/ )[0];
+            my %public = ( ( caller )[1] =~ /opac/ ) ? ( public => 1 ): ();
+            my $upload = Koha::UploadedFiles->search({
+                hashvalue => $id, %public,
+            })->next;
+            next if !$upload || $upload->filename !~ /\./;
+            $HTML5Media{extension} = ( $upload->filename =~ m/([^.]+)$/ )[0];
         }
         # check remote files
         else {