merging dev-week and head. NOTE:

<<<<<<< opac-readingrecord.pl
use C4::Date;
use C4::Members;
=======
use C4::Date;
use C4::Search;
>>>>>>> 1.6.2.6

C4::Search ... but it might be needed.

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 895b4c3..ba34745 100755 (executable)
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -77,13 +77,10 @@ for (my $i=0;$i<$count;$i++){
        push(@loop_reading,\%line);
 }
 
-$template->param(count => $count);
-$template->param(READING_RECORD => \@loop_reading,
+$template->param(count => $count,
+                               READING_RECORD => \@loop_reading,
                                limit => $limit,
                                showfulllink => ($count > 50),          
-                            LibraryName => C4::Context->preference("LibraryName"),
-                               suggestion => C4::Context->preference("suggestion"),
-                               virtualshelves => C4::Context->preference("virtualshelves"),
 );