bug: query squashes issues.timestamp which circulation.pl needs to sort todaysissues

Little change to the query so we get the right timestamp to sort on.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>

diff --git a/C4/Members.pm b/C4/Members.pm
index 8cc32bd..7ef8094 100644 (file)
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -999,6 +999,7 @@ The keys include C<biblioitems> fields except marc and marcxml.
 #'
 sub GetPendingIssues {
     my ($borrowernumber) = @_;
+<<<<<<< HEAD:C4/Members.pm
     # must avoid biblioitems.* to prevent large marc and marcxml fields from killing performance
     # FIXME: namespace collision: each table has "timestamp" fields.  Which one is "timestamp" ?
     # FIXME: circ/ciculation.pl tries to sort by timestamp!