From: Michael Hafen <mdhafen@tech.washk12.org>
Date: Wed, 10 Sep 2008 19:12:56 +0000 (-0600)
Subject: bug: query squashes issues.timestamp which circulation.pl needs to sort todaysissues
X-Git-Tag: v3.00.04~632
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=67bbd535cad7679f0ab4b8b39696f1c4a6c89271;p=koha.git

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 8cc32bdc64..7ef8094502 100644
--- 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!