From 6520f270414167a10cfdd8661c6a38e467d8781d Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Mon, 10 Mar 2014 08:23:13 -0400 Subject: [PATCH] Bug 11703 [QA Followup 10] - Fix errors caused by rebase --- .../prog/en/modules/members/moremember.tt | 3 ++- svc/checkouts.pl | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt index f70e403..062e723 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt @@ -12,9 +12,10 @@ [% INCLUDE 'datatables-strings.inc' %] +[% INCLUDE 'datatables.inc' %] [% INCLUDE 'strings.inc' %] - + [% INCLUDE 'timepicker.inc' %] diff --git a/svc/checkouts.pl b/svc/checkouts.pl index 6438953..ab59fb4 100755 --- a/svc/checkouts.pl +++ b/svc/checkouts.pl @@ -99,8 +99,7 @@ else { } push( @parameters, @borrowernumber ); -$sql .= " ORDER BY ? $sorting_direction "; -push( @parameters, $sorting_column ); +$sql .= " ORDER BY $sorting_column $sorting_direction "; my $dbh = C4::Context->dbh(); my $sth = $dbh->prepare($sql); @@ -117,7 +116,6 @@ while ( my $c = $sth->fetchrow_hashref() ) { my ( $renewals_count, $renewals_allowed, $renewals_remaining ) = GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} ); - push( @checkouts, { -- 1.7.2.5