merged from upstream master

[koha.git] / opac / opac-reserve.pl

diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index a0b0e45..d5d39db 100755 (executable)
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -189,6 +189,8 @@ if ( $query->param('place_reserve') ) {
            ) {
            $startdate = $query->param("reserve_date_$biblioNum");
        }
+       
+       my $expiration_date = $query->param("expiration_date_$biblioNum");
 
         # If a specific item was selected and the pickup branch is the same as the
         # holdingbranch, force the value $rank and $found.
@@ -208,7 +210,7 @@ if ( $query->param('place_reserve') ) {
         }
 
         # Here we actually do the reserveration. Stage 3.
-        AddReserve($branch, $borrowernumber, $biblioNum, 'a', [$biblioNum], $rank, $startdate, $notes,
+        AddReserve($branch, $borrowernumber, $biblioNum, 'a', [$biblioNum], $rank, $startdate, $expiration_date, $notes,
                    $biblioData->{'title'}, $itemNum, $found) if ($canreserve);
     }
 
@@ -292,7 +294,6 @@ $template->param('item-level_itypes' => $itemLevelTypes);
 foreach my $biblioNum (@biblionumbers) {
 
     my $record = GetMarcBiblio($biblioNum);
-    my $subtitle = C4::Biblio::get_koha_field_from_marc('bibliosubtitle', 'subtitle', $record, '');
     # Init the bib item with the choices for branch pickup
     my %biblioLoopIter = ( branchChoicesLoop => $CGIbranchloop );
 
@@ -305,7 +306,7 @@ foreach my $biblioNum (@biblionumbers) {
 
     $biblioLoopIter{biblionumber} = $biblioData->{biblionumber};
     $biblioLoopIter{title} = $biblioData->{title};
-    $biblioLoopIter{subtitle} = $subtitle;
+    $biblioLoopIter{subtitle} = GetRecordValue('subtitle', $record, GetFrameworkCode($biblioData->{biblionumber}));
     $biblioLoopIter{author} = $biblioData->{author};
     $biblioLoopIter{rank} = $biblioData->{rank};
     $biblioLoopIter{reservecount} = $biblioData->{reservecount};
@@ -486,10 +487,11 @@ if (
     C4::Context->preference( 'OPACAllowHoldDateInFuture' )
     ) {
     $template->param(
-       reserve_in_future         => 1,
-       DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar(),
-       );
+           reserve_in_future         => 1,
+    );
 }
 
+$template->param( DHTMLcalendar_dateformat  => C4::Dates->DHTMLcalendar() );
+
 output_html_with_http_headers $query, $cookie, $template->output;