Bug 7977: QOTD uploader to enable uploading csv files containing quotes

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

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index e6550a5..04c3293 100755 (executable)
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -25,8 +25,8 @@ use C4::Auth;
 use C4::Koha;
 use C4::Biblio;
 use C4::Circulation;
-use C4::Dates qw/format_date/;
 use C4::Members;
+use Koha::DateUtils;
 
 use C4::Output;
 
@@ -45,7 +45,7 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 # get borrower information ....
 my ( $borr ) = GetMemberDetails( $borrowernumber );
 
-$template->param($borr);
+$template->param(%{$borr});
 
 my $itemtypes = GetItemTypes();
 
@@ -74,16 +74,13 @@ else {
 
 my ( $issues ) = GetAllIssues( $borrowernumber, $order, $limit );
 
-my @bordat;
-$bordat[0] = $borr;
-$template->param( BORROWER_INFO => \@bordat );
 
 my @loop_reading;
 
 foreach my $issue (@{$issues} ) {
     my %line;
        
-    my $record = GetMarcBiblio($issues->[$i]->{'biblionumber'});
+    my $record = GetMarcBiblio($issue->{'biblionumber'});
 
        # XISBN Stuff
        my $isbn               = GetNormalizedISBN($issue->{'isbn'});
@@ -92,15 +89,16 @@ foreach my $issue (@{$issues} ) {
     $line{title}           = $issue->{'title'};
     $line{author}          = $issue->{'author'};
     $line{itemcallnumber}  = $issue->{'itemcallnumber'};
-    $line{date_due}        = format_date( $issue->{'date_due'} );
-    $line{returndate}      = format_date( $issue->{'returndate'} );
+    $line{date_due}        = $issue->{'date_due'};
+    $line{returndate}      = $issue->{'returndate'};
     $line{volumeddesc}     = $issue->{'volumeddesc'};
-    if($issue{'itemtype'}) {
+    $issue->{'itemtype'}   = C4::Context->preference('item-level_itypes') ? $issue->{'itype'} : $issue->{'itemtype'};
+    if($issue->{'itemtype'}) {
         $line{'description'}   = $itemtypes->{ $issue->{'itemtype'} }->{'description'};
         $line{imageurl}        = getitemtypeimagelocation( 'opac', $itemtypes->{ $issue->{'itemtype'}  }->{'imageurl'} );
     }
     push( @loop_reading, \%line );
-    $line{subtitle} = GetRecordValue('subtitle', $record, GetFrameworkCode($issues->[$i]->{'biblionumber'}));
+    $line{subtitle} = GetRecordValue('subtitle', $record, GetFrameworkCode($issue->{'biblionumber'}));
 }
 
 if (C4::Context->preference('BakerTaylorEnabled')) {